1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 712bac17..dc6d534d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:ChangeLog
 2008-11-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/openglgraphics.h, src/openglgraphics.cpp: Made an option around
@@ -6142,3 +6143,5 @@
 	window a shorter.
 	* data/graphics/images/login_wallpaper.png: New login wallpaper by
 	Momotaro.
+=======
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:ChangeLog