diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 0b090bb..f3558a9 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -135,7 +135,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb  3 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.90-1
 - Update to 2.25.90
 
->>>>>>> 1.204
 * Mon Jan 19 2009 Ray Strode <rstrode@redhat.com> - 2.25.5-2
 - Rebuild so i can chain-build