From 3aca1f5b4f11a3bb90ecacfb43346a1e2832397d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Dec 2008 19:44:30 -0700
Subject: Fixed a few files that apparently weren't updated.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'ChangeLog')

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