From: FruitieX <fruitiex@gmail.com>
Date: Wed, 13 Apr 2011 08:55:55 +0000 (+0300)
Subject: remove the old shownames from here
X-Git-Tag: xonotic-v0.5.0~292
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85a3f454df920f74a62def7a78311734a08c9247;p=xonotic%2Fxonotic-data.pk3dir.git

remove the old shownames from here
---

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 09c35e37bb..e4c6696633 100644
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -220,7 +220,6 @@ seta hud_panel_infomessages_bg_border "" "if set to something else than \"\" = o
 seta hud_panel_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_infomessages_flip "" "1 = align the items to the right"
 
-<<<<<<< HEAD
 seta hud_panel_physics "" "enable/disable this panel, 1 = show if not observing, 2 = show always"
 seta hud_panel_physics_pos "" "position of this base of the panel"
 seta hud_panel_physics_size "" "size of this panel"
@@ -235,14 +234,3 @@ seta hud_panel_physics_flip "" "flip speed/acceleration positions"
 seta hud_panel_physics_progressbar "" "enable progressbar in panel (2 = only for speed; 3 = only for acceleration)"
 seta hud_panel_physics_acceleration_progressbar_mode "" "0 = progressbar increases from the center to the right if the acceleration is positive, to the left if it's negative; 1 = progressbar increases from the border in the same direction for both positive and negative accelerations"
 seta hud_panel_physics_text "" "show text in panel (2 = only for speed; 3 = only for acceleration)"
-=======
-seta hud_panel_shownames "" "enable/disable this panel, 1 = teammates only, 2 = everyone"
-seta hud_panel_shownames_pos "" "position of this base of the panel"
-seta hud_panel_shownames_size "" "size of this panel"
-seta hud_panel_shownames_bg "" "if set to something else than \"\" = override default background"
-seta hud_panel_shownames_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_panel_shownames_bg_color_team "" "override panel color with team color in team based games"
-seta hud_panel_shownames_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_panel_shownames_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_panel_shownames_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
->>>>>>> fruitiex/better_shownames