From b54f0aa8390b4fcebc4c54e9137abb37028920d1 Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Date: Nov 22 2017 16:43:43 +0000
Subject: Fix the gitignore file for the package


---

diff --git a/.gitignore b/.gitignore
index 9b59c8a..6264b61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,9 @@
 /apache-libcloud-0.8.0.tar.bz2
 /apache-libcloud-0.9.1.tar.bz2
 /apache-libcloud-0.10.1.tar.bz2
-<<<<<<< HEAD
 /apache-libcloud-0.11.4.tar.bz2
-=======
 /apache-libcloud-0.11.1.tar.bz2
 /apache-libcloud-0.11.3.tar.bz2
->>>>>>> 250ecdf29f7522dcf82f41ea8b3da5a1c09e110f
 /apache-libcloud-0.12.1.tar.bz2
 /apache-libcloud-0.12.3.tar.bz2
 /apache-libcloud-0.12.4.tar.bz2
diff --git a/python-libcloud.spec b/python-libcloud.spec
index addc84f..0a05ee0 100644
--- a/python-libcloud.spec
+++ b/python-libcloud.spec
@@ -16,7 +16,7 @@ any of the services that it supports.
 %endif
 Name:           python-libcloud
 Version:        2.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Python library to address multiple cloud provider APIs
 
 Group:          Development/Languages
@@ -93,6 +93,9 @@ rm -r $RPM_BUILD_ROOT%{python3_sitelib}/%{srcname}/test
 %endif
 
 %changelog
+* Thu Nov 23 2017 Sayan Chowdhury <sayanchowdhury@fedoraproject.org> - 2.2.1-3
+- Fix the gitignore file for the package
+
 * Wed Nov 22 2017 Sayan Chowdhury <sayanchowdhury@fedoraproject.org> - 2.2.1-2
 - Add package python-pytest-runner as BuildRequires