X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=4d3c1fea781856a841a6ed030eb1789a1abb9b15;hp=4f02d145e0276f7d66ae0a9036c3b9d9d6191cd2;hb=e921ae9f86a09d0a20cd4c72b44e6d71d25975ea;hpb=4566767f430d7a15f918d80b234f04c71f929b4e

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 4f02d145e0..4d3c1fea78 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1432,7 +1432,12 @@ set cl_fullbright_items 0 "enable fullbright items (if server allows, controled
 set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0"
 set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
 
+<<<<<<< HEAD
+set sv_showspectators 0
+set cl_showspectators 1
+=======
 // Facility for config.cfg use ONLY.
 // Interpreted in post-config.cfg.
 seta menu_forced_saved_cvars "" "These cvars will always be saved, despite engine/Xonotic cvar saving status"
 set menu_reverted_nonsaved_cvars "" "These cvars are currently marked as saved in the flags, but have been reverted and won't stay saved. INTERNAL USE ONLY."
+>>>>>>> master