Update CVars.cs

WWhiteDreamProject · Sep 16, 2024 · 980e442 · 980e442
1 parent 315ba53
commit 980e442
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Content.Shared/_White/CVars.cs b/Content.Shared/_White/CVars.cs
@@ -32,19 +32,19 @@ public static readonly CVarDef<string>
 
     #endregion
 
-<<<<<<< ghost-respawn
     #region GhostRespawn
     public static readonly CVarDef<double> GhostRespawnTime =
         CVarDef.Create("ghost.respawn_time", 15d, CVar.SERVERONLY);
 
     public static readonly CVarDef<int> GhostRespawnMaxPlayers =
         CVarDef.Create("ghost.respawn_max_players", 40, CVar.SERVERONLY);
-=======
+
+    #endregion
+
     #region OptionsMisc
 
     public static readonly CVarDef<bool> LogInChat =
         CVarDef.Create("white.log_in_chat", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED);
 
->>>>>>> master
     #endregion
 }