From b8d5342f34a7b07bc495665d2a557d40841bbdba Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 28 Aug 2003 12:23:35 +0000
Subject: Remove junk

svn-id: r9891
---
 scumm/string.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scumm/string.cpp b/scumm/string.cpp
index 5f39617eee..dee0c92e54 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -16,11 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
-<<<<<<< string.cpp
  * $Header$
-=======
- * $Header$
->>>>>>> 1.153
  *
  */
 
-- 
cgit v1.2.3