fix some merge conflicts in this cbp file, whatever that is. This may work, or may...

diff --git a/qcsrc/qc-client.cbp b/qcsrc/qc-client.cbp
index 63e00e9e1774ea707be6c07f377eebdecc922765..b8d82f57451cecfc5e59ccbed6bdcfaf67e256c2 100644 (file)
--- a/qcsrc/qc-client.cbp
+++ b/qcsrc/qc-client.cbp
@@ -11,11 +11,7 @@
                        <Build command="$make -src $makefile" />
                        <CompileFile command="$make -src $makefile" />
                        <Clean command="$make -src $makefile" />
-<<<<<<< HEAD
                        <DistClean command="$make -f $makefile distclean$target" />
-=======
-                       <DistClean command="" />
->>>>>>> origin/master
                        <AskRebuildNeeded command="" />
                        <SilentBuild command="$make -src $makefile" />
                </MakeCommands>
@@ -49,21 +45,12 @@
                                        <Add option="-s" />
                                </Linker>
                                <MakeCommands>
-<<<<<<< HEAD
                                        <Build command="$make -src $makefile" />
                                        <CompileFile command="$make -src $makefile" />
                                        <Clean command="$make -src $makefile" />
                                        <DistClean command="" />
                                        <AskRebuildNeeded command="" />
                                        <SilentBuild command="$make -src $makefile" />
-=======
-                                       <Build command="$make -DRELEASE -src $makefile" />
-                                       <CompileFile command="$make -DRELEASE -src $makefile" />
-                                       <Clean command="$make -DRELEASE -src $makefile" />
-                                       <DistClean command="" />
-                                       <AskRebuildNeeded command="" />
-                                       <SilentBuild command="$make -DRELEASE -src $makefile" />
->>>>>>> origin/master
                                </MakeCommands>
                        </Target>
                </Build>
@@ -108,13 +95,10 @@
                <Unit filename="client\progs.src.REMOTE.src" />
                <Unit filename="client\projectile.qc" />
                <Unit filename="client\rubble.qc" />
-<<<<<<< HEAD
                <Unit filename="client\scoreboard.qc" />
                <Unit filename="client\scoreboard.qh" />
                <Unit filename="client\shownames.qc" />
                <Unit filename="client\shownames.qh" />
-=======
->>>>>>> origin/master
                <Unit filename="client\sortlist.qc" />
                <Unit filename="client\target_music.qc" />
                <Unit filename="client\teamplay.qc" />