[gnome-chemistry-utils: 2/2] Fixed the conflicts

[belegdol]

commit 0d3aab672ccfba6f4b17f02ec8c903f049f2cf1c
Merge: 6b0db5f d838058
Author: Julian Sikorski <belegdol at gmail.com>
Date:   Sun Feb 20 22:41:22 2011 +0100

    Fixed the conflicts

 gnome-chemistry-utils.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gnome-chemistry-utils.spec
index 865ff46,1b0f042..0c47bd2
--- a/gnome-chemistry-utils.spec
+++ b/gnome-chemistry-utils.spec
@@@ -236,10 -235,9 +236,13 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
 +* Sun Feb 20 2011 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.7-1
 +- Updated to 0.12.7
 +- Updated the gcc-4.6 fix
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.6-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Sat Feb 05 2011 Julian Sikorski <belegdol at fedoraproject.org> - 0.12.6-2
  - Rebuilt for goffice-0.8.13 and gnumeric-1.10.13
  - Added -fpermissive to CXXFLAGS to fix building with gcc-4.6