1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b69cb84ef..362c5ce48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,6 @@
 
 	Use the right prefs to disable CUPS.
 
->>>>>>> .r7150
 2007-07-11  Luca Ferretti  <elle.uca@libero.it>
 
 	* data/chrome/about.xhtml: