1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da6b2ff630..23ca97c49c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+<<<<<<< .mine
+2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS, configure.in: evolution 2.21.4 release.
+
+=======
 2007-12-17  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in:
 	Bump eds_minimum_version to 2.21.4 for new Camel functions.
 
+>>>>>>> .r34724
 2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in: