From dc78af3e04e4f4dbcce95b7802bf30650253ed9b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Aug 06 2007 16:23:16 +0000
Subject: remove a conflict marker


---

diff --git a/gdm.spec b/gdm.spec
index 147040f..cc51f1d 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -368,7 +368,6 @@ fi
 - remove dwellmouselistener module from default configuration.
   It's pretty broken (bug 248752)
 
->>>>>>> 1.266
 * Fri Aug  3 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.19.5-2
 - Update license field