From 82c56cb5d7799d94c72bdd8cf409333014204493 Mon Sep 17 00:00:00 2001
From: Thomas Thurman <thomas@thurman.org.uk>
Date: Sun, 8 Apr 2007 18:17:38 +0000
Subject: [PATCH] removed conflict line.

2007-04-08  Thomas Thurman  <thomas@thurman.org.uk>

        * ChangeLog: removed conflict line.



svn path=/trunk/; revision=3175
---
 ChangeLog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ed5eb6e94..cecd02826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-08  Thomas Thurman  <thomas@thurman.org.uk>
+
+        * ChangeLog: removed conflict line.
+
 2007-04-07  Elijah Newren  <newren gmail com>
 
 	* src/prefs.[ch] (screen_bindings array,
@@ -224,7 +228,6 @@
 	* src/window.c (meta_window_new_with_attrs):
 	new hooks to handle new atom
 
->>>>>>> .r3171
 2007-03-26  Josselin Mouette  <joss@malsain.org>
 
 	* src/session.c (meta_session_init): if previous client ID