Update bmakecommon.mpt

Author: jwillemsen

templates/bmakecommon.mpt

@@ -32,12 +32,9 @@ link = ilink32
 common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT) $(CG_LIB)
 tlib = tlib
 pch = 1
-<<<<<<< Updated upstream
 ccflags = -q
-=======
 dllflags = -Tpd -Gi -x -Gn -w-dup
 object_search_path = 1
->>>>>>> Stashed changes
 }
 
 bcc32c {
@@ -56,12 +53,9 @@ startup_bits = 32
 link = ilink32
 common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT)
 tlib = tlib
-<<<<<<< Updated upstream
 ccflags = -q
-=======
 dllflags = -Tpd -Gi -x -Gn -w-dup
 object_search_path = 1
->>>>>>> Stashed changes
 }
 
 bcc64 {
@@ -80,12 +74,9 @@ startup_bits = 64
 link = ilink64
 common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
 tlib = tlib64
-<<<<<<< Updated upstream
 ccflags = -q
-=======
 dllflags = -Tpd -Gi -x -Gn -w-dup
 object_search_path = 1
->>>>>>> Stashed changes
 }
 
 bcc64x {
@@ -101,16 +92,10 @@ common_flags =
 obj_ext = .o
 linker_paths = -L\"$(BDS)\lib\win64x\debug\" -L\"$(BDS)\lib\win64x\release\"
 startup_bits = 64
-<<<<<<< Updated upstream
-link = bcc64x
-common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
-tlib = tlib64
-ccflags =
-=======
+ccflags = -q
 link = ld.lld
 common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
 tlib = tlib64
 dllflags = -m i386pep -shared --Bstatic --entry DllMainCRTStartup --enable-auto-image-base
 object_search_path = 0
->>>>>>> Stashed changes
 }