Windows Makefile fix

diff --git a/Makefile.nmake b/Makefile.nmake
index 8342d96e62c90ee43393e92539a1b07e77907b42..3f9701437e2efc03ca5a013aa2bd1720df529080 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -17,11 +17,7 @@ CROSSLIBS =
 !include "objects.mk"
 
 
-<<<<<<< HEAD
 OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o 
-=======
-OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o mediafile.o
->>>>>>> 4612f8232dc402bada10681545f690c47ef4493a
 
 OBJECTS = $(OBJECTS1) $(OBJECTSWIN)