[commoncpp2: 2/2] Fix merge conflicts

[Kevin Fenzi]

commit feed1a4be0550882cc3a148b448c98a74428bdc1
Merge: 1d85fce 3e67556
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Jan 22 19:34:24 2012 -0700

    Fix merge conflicts

 .gitignore      |    1 +
 commoncpp2.spec |    3 +++
 sources         |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 3e69ff8,3e69ff8..13257a6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
  commoncpp2-1.7.3.tar.gz
++/commoncpp2-1.8.1.tar.gz
diff --cc commoncpp2.spec
index f439652,d154ae6..1fb22c4
--- a/commoncpp2.spec
+++ b/commoncpp2.spec
@@@ -81,9 -80,9 +81,12 @@@ f
  %{_infodir}/commoncpp2.info*
  
  %changelog
 +* Sun Jan 22 2012 Kevin Fenzi <kevin at scrye.com> - 1.8.1-1
 +- Update to 1.8.1
 +
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.3-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.3-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
  
diff --cc sources
index c85e11e,c85e11e..3d07143
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
--ca741179a728d264eb276ae471ebaf70  commoncpp2-1.7.3.tar.gz
++4804b184e609154ba2bc0aa9f61dc6ef  commoncpp2-1.8.1.tar.gz