From 5e496b3eed8f4e93ff4f028a832d5a1a217d6192 Mon Sep 17 00:00:00 2001 From: Jakob MG Date: Wed, 18 May 2011 13:08:56 +0200 Subject: [PATCH] Moar conflict be gonez --- qcsrc/common/constants.qh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 6643fab8c..e5b121ca3 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -63,11 +63,8 @@ const float TE_CSQC_NOTIFY = 112; const float TE_CSQC_WEAPONCOMPLAIN = 113; const float TE_CSQC_NEX_SCOPE = 116; const float TE_CSQC_MINELAYER_MAXMINES = 117; -<<<<<<< HEAD -const float TE_CSQC_VEHICLESETUP = 119; -======= const float TE_CSQC_HAGAR_MAXROCKETS = 118; ->>>>>>> origin/master +const float TE_CSQC_VEHICLESETUP = 119; const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const float RACE_NET_CHECKPOINT_CLEAR = 1; -- 2.39.2