rpms/gdm/devel gdm.spec,1.267,1.268

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16907

Modified Files:
	gdm.spec 
Log Message:
remove a conflict marker



Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- gdm.spec	6 Aug 2007 16:11:10 -0000	1.267
+++ gdm.spec	6 Aug 2007 16:23:16 -0000	1.268
@@ -368,7 +368,6 @@
 - remove dwellmouselistener module from default configuration.
   It's pretty broken (bug 248752)
 
->>>>>>> 1.266
 * Fri Aug  3 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.5-2
 - Update license field