Moar conflict be gonez

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 6643fab8cd6d8c99910968a362d44f30bfca3710..e5b121ca3e1a7b5f32bcd6b74d8baf2fac381513 100644 (file)
--- 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;