From: Chris Elliott <biol75@york.ac.uk>
Date: Thu, 26 Jun 2003 11:22:50 +0000 (+0000)
Subject: remove conflicts
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/df2309bac7bdde54885189af0eaac46d8735d3f8

remove conflicts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/makelib.wat b/src/makelib.wat
index 3390cb6ff2..110f0398a5 100644
--- a/src/makelib.wat
+++ b/src/makelib.wat
@@ -2,7 +2,7 @@
 # Changelist:	2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #
 
-<<<<<<< makelib.wat
+
 THISDIR = $+ $(%cdrive):$(%cwd) $-
 # set OUTPUTDIR to the directory to be used for the .obj files created during
 # the build (under $THISDIR)
@@ -11,31 +11,15 @@ OUTPUTDIR=$(THISDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
 # no trailing slash for win98
 !endif
 
-=======
-OUTPUTDIR= $+ $(%cdrive):$(%cwd)\WATCOM $-
-
->>>>>>> 1.1.8.2
 !include $(WXDIR)\src\makewat.env
-<<<<<<< makelib.wat
 
-all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
-=======
 
->>>>>>> 1.1.8.2
 
-<<<<<<< makelib.wat
-$(OUTPUTDIR):
-	@if not exist $^@ mkdir $^@
-=======
 all: MAKDIR $(LIBTARGET) .SYMBOLIC
->>>>>>> 1.1.8.2
 
-<<<<<<< makelib.wat
-=======
 MAKDIR:  .SYMBOLIC
 	@if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
 
->>>>>>> 1.1.8.2
 # the name of the file containing the objects to be put in the library
 LBCFILE=$(LIBTARGET).lbc
 $(LIBTARGET) : $(OBJECTS)