From bd27ced6025b5ce285080806ecd44c8b9bc1786a Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 27 Aug 2012 17:47:58 +0000
Subject: Remove accidental commit of merge conflict, resolved to original
 code.

---
 win/buildall.vc.bat | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index 1400dbb..3ebba7e 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -63,7 +63,6 @@ if "%TCLDIR%" == "" set TCLDIR=..\..\tcl
 
 :: Build the normal stuff along with the help file.
 ::
-<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
 set OPTS=none
 if not %SYMBOLS%.==. set OPTS=symbols
 nmake -nologo -f makefile.vc release htmlhelp OPTS=%OPTS% %1
@@ -85,30 +84,6 @@ if errorlevel 1 goto error
 
 :: Build the core and shell for thread support.
 ::
-======= COMMON ANCESTOR content follows ============================
-set OPTS=none
-if not %SYMBOLS%.==. set OPTS=symbols
-nmake -nologo -f makefile.vc release winhelp OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-:: Build the static core, dlls and shell.
-::
-set OPTS=static
-if not %SYMBOLS%.==. set OPTS=symbols,static
-nmake -nologo -f makefile.vc release OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-:: Build the special static libraries that use the dynamic runtime.
-::
-set OPTS=static,msvcrt
-if not %SYMBOLS%.==. set OPTS=symbols,static,msvcrt
-nmake -nologo -f makefile.vc core OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-:: Build the core and shell for thread support.
-::
-======= MERGED IN content follows ==================================
->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 set OPTS=threads
 if not %SYMBOLS%.==. set OPTS=symbols,threads
 nmake -nologo -f makefile.vc release OPTS=%OPTS% %1
-- 
cgit v0.12