rpms/beagle/devel beagle.spec,1.126,1.127

[David Nielsen (dnielsen)]

Author: dnielsen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14374

Modified Files:
	beagle.spec 
Log Message:



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- beagle.spec	25 Feb 2008 13:57:35 -0000	1.126
+++ beagle.spec	25 Feb 2008 13:59:31 -0000	1.127
@@ -273,18 +273,12 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
-<<<<<<< beagle.spec
-* Mon Feb 25 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.3-7
-- Break out beagle-firefox
-
-=======
 * Mon Feb 25 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.3-8
 - do the former right
 
 * Mon Feb 25 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.3-7
 - Break out beagle-firefox
 
->>>>>>> 1.125
 * Sat Feb 23 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.3-6
 - Fix build with new mono