1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bfbc4fe..f9eb4d56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
         * src/mapmanager.cpp, src/mapmanager.h, tmwserv.dev,: Forgot a way to
 		access maps.
+		* tmwserv.dev: Fixed merge conflict as pointed out by Bjørn.
 
 2005-12-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>