From 43e4866df487add3e6d39d09074adf32e50420ec Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 30 Mar 2016 01:27:59 -0400
Subject: [PATCH] Fixed a mismerge.

---
 Sources/GameMP/Game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/GameMP/Game.cpp b/Sources/GameMP/Game.cpp
index b7a29ec..381d8a5 100644
--- a/Sources/GameMP/Game.cpp
+++ b/Sources/GameMP/Game.cpp
@@ -122,7 +122,7 @@ INDEX gam_iObserverOffset = 0;
 
 INDEX gam_iStartDifficulty = 1;
 INDEX gam_iStartMode = 0;
-CTString gam_strGameSpyExtras = "";
+CTString gam_strGameAgentExtras = "";
 
 INDEX gam_iBlood = 2;     // 0=none, 1=green, 2=red, 3=hippie
 INDEX gam_bGibs  = TRUE;