From 3f483431d93f96392954329355c1fea52bada49a Mon Sep 17 00:00:00 2001
From: perle <per-thormann@gmx.de>
Date: Thu, 1 Aug 2024 07:51:20 +0200
Subject: [PATCH] missed 2 lines

---
 engine/code/cgame/cg_servercmds.c |   2 --
 engine/code/qcommon/q_shared.h    |  18 +-----------------
 q3rallycode.ppr                   | Bin 34265 -> 32423 bytes
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/engine/code/cgame/cg_servercmds.c b/engine/code/cgame/cg_servercmds.c
index a504fa63..f58bcbff 100644
--- a/engine/code/cgame/cg_servercmds.c
+++ b/engine/code/cgame/cg_servercmds.c
@@ -284,8 +284,6 @@ void CG_SetConfigValues( void ) {
 		s = CG_ConfigString( CS_FLAGSTATUS );
 		cgs.redflag = s[0] - '0';
 		cgs.blueflag = s[1] - '0';
-        cgs.greenflag = s[2] - '0';
-        cgs.yellowflag = s[3] - '0';
 	}
 
 	else if ( cgs.gametype == GT_DOMINATION ) {
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index e2b44ab2..01922ad0 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -70,23 +70,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-#define PRODUCT_VERSION "v0.5 r607"
-=======
-#define PRODUCT_VERSION "v0.5 r605"
->>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
-=======
-#define PRODUCT_VERSION "v0.5 r605"
->>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
-=======
-#define PRODUCT_VERSION "v0.5 r605"
->>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
-=======
-#define PRODUCT_VERSION "v0.5 r607"
->>>>>>> 4347bd4648d9315f81c43fe093cb4a6b6ef8a030
+#define PRODUCT_VERSION "v0.5 (r613)"
 #endif
 
 
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index f237ab0eaca318ff69e9e1093abe81ca0adb2f3d..a47ae9f162c5d18fc78cd85c3608ae6aaebbd508 100644
GIT binary patch
delta 103
zcmccF&9wY4<A%K2$#VrcCl|ExOs=a{nQYczHo31>Wb&dWvB{GggawR^dAXbui&9H$
v4Rs8S&5R~5Xp)?KSA=_VO)C$-nITNl$Wq71V)BOuJpoggkg=JLIZ!hI%%LJy

delta 1314
zcmaKsO;6N77{{|15$hHsAY#HUXj~<6LguyY9QGnt;i5MnSi0k~k?msH$f+35TukNz
z7*Cu`{3v=f@iXWrF!7n`b{IqCHq+<#y#J@?e;Pl|roQH-zTcW_Q2niZ&|o?(7X$T9
z<>U1%47j=KUw392!kn79I_VYZi7`di^l9$Kb#sd+x7&@xf=7kw4Kf=;!iRfX*{D$a
zqqOK5n&7U=`-5EVWTT$i>8C@rlMeQJ!?(<u$z}6?e{VQA&a9bs^@o*t{iPLLBdj`a
zw&Bd}`Ih5^x!(=*H-o%?Y&|1OgyXd6D_b0i?U!Jz(xD})@()K@dboZ7mCCOE_;6{J
zUQsb%RKF@8PeEOupDpU?jahwOMmjHVPFK^?zssi!oQJ_iTBvcCF+^BI!(dy7t>yM^
z7`z-EJ%@30nIttN5yz21zL#x%cG{d}wS@^3GYGlVne536Kq!`uBZ$x_G9;{Uy5(a8
z;~JBQ5Mtv!aqIO_ETPg#;lN@kZA94o>U!pZ)GM9}L^;M2FkJR9&O{wfLXVu-PMltR
zGI1>nfdsbX`(sZ@9!$6kE1++Y!07(3G2fB8ksC*5W`4=hsc(1nVp&8mHyOeqXSLEw
znlme2jyQ2kp&TUyl(20jyxIPTi<qm0NfdD_5s25RB<)2M#I*|~PfWW;>}$2yJvK?8
zr)q(OL`Y&tV$*l(ci_R%g-QuZKqQuYRJ{+6BRGodsGNc<5@8m(HhDQdNr~%TV2~sS
z$8C63i!VIN%x+R6Oz6t(9e8deb{e6uy@XrI{ak43t<&aw?8ZqbqKVB5FLbR?uT`P)
ROu=8l3wEKmgdqtv`~}4aiW~p{