[rubygem-awesome_spawn: 2/2] Bump version

[Achilleas Pipinellis]

commit 5f01298abeb7f6327e535a0d73920b9754573ecf
Merge: 9b7cc85 f73e0ca
Author: Achilleas Pipinellis <axilleas at axilleas.me>
Date:   Fri Aug 8 16:59:53 2014 +0000

    Bump version

 .gitignore                 |    6 ++++++
 rubygem-awesome_spawn.spec |   11 +++++++++++
 sources                    |    4 ++++
 3 files changed, 21 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 452bf19,4883151..4ab935b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,7 +1,8 @@@
  /awesome_spawn-1.0.0.gem
 +/awesome_spawn-1.2.1.gem
+ /awesome_spawn-1.1.1.gem
+ *log
+ *rpm
+ noarch/
+ results*
+ awesome*
diff --cc rubygem-awesome_spawn.spec
index 4046588,92e1487..4191674
--- a/rubygem-awesome_spawn.spec
+++ b/rubygem-awesome_spawn.spec
@@@ -73,9 -74,12 +78,15 @@@ pop
  %{gem_instdir}/spec/
  
  %changelog
 +* Fri Aug 08 2014 Achilleas Pipinellis <axilleas at fedoraproject.org> - 1.2.1-1
 +- Bump version
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Mon Feb 24 2014 Achilleas Pipinellis <axilleas at fedoraproject.org> - 1.1.1-1
+ - Update to 1.1.1
+ 
  * Tue Jan 21 2014 Achilleas Pipinellis <axilleaspi at ymail.com> - 1.0.0-2
  - Remove unecessary comments
  - Fix Requires/BuildRequires typos
diff --cc sources
index 6fb6285,456d63c..52fcd67
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +1744a16fc1a9c7c611985f354196bbf5  awesome_spawn-1.2.1.gem
++=======
+ e817a84a54ceac29465f77394148ae2d  awesome_spawn-1.1.1.gem
++>>>>>>> f73e0cac30882f51ba4d693953982a6130718dad