From: David Webster <Dave.Webster@bhmi.com>
Date: Thu, 10 May 2001 13:28:01 +0000 (+0000)
Subject: Get rid of the CVS merge characters that have worked their way into this causing... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d38d271fa63aa59d8531710b4c143ecf33fbb819?ds=inline

Get rid of the CVS merge characters that have worked their way into this causing the dll builds from the command line to fail.


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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index f940d3b6aa..e3b0479255 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -464,11 +464,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-<<<<<<< vc.t
     $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib  $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
-=======
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
->>>>>>> 1.32
 	delayimp.lib
 	/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
 	/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll