From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 18 May 2011 11:08:56 +0000 (+0200)
Subject: Moar conflict be gonez
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~50
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e496b3eed8f4e93ff4f028a832d5a1a217d6192;p=xonotic%2Fxonotic-data.pk3dir.git

Moar conflict be gonez
---

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;