From 634c7a10dca536f676d053c13fb9f6074db037cb Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 27 Nov 2006 22:26:08 +0000
Subject: [PATCH] Oops. Remove leftover of merge conflict.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2552 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 1970a6140..194429b8c 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,7 +1,6 @@
 Changes towards version 0.6:
 - Unix build scripts improvements. - SvdB
 - Build fixes for MacOS X (with thanks to Nic) - SvdB
-=======
 - Ships in battle can resume normal speed in all circumstances after
   the enemy Avatar's tractor beam disengages (bug #860; this is a
   netplay desynchronizing change) - Alex