Remove diff marker.

OpenArena-Ioq3 · Jul 2, 2023 · 028e8bc · 028e8bc
1 parent 161a799
commit 028e8bc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
@@ -41,7 +41,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   #define CINEMATICS_INTRO		"intro.roq"
   #define LEGACY_PROTOCOL	// You probably don't need this for your standalone game
 //  #define PROTOCOL_HANDLER		"foobar"
->>>>>>> clean
 #else
   #define PRODUCT_NAME				"ioq3"
   #define BASEGAME					"baseq3"