resolve conflicts

README.md

@@ -88,11 +88,8 @@ Archive's bin directory contains 2 subdirectories, 'bugfixed' and 'pure'
 | mp_buy_anywhere                    | 0       | 0   | 3            | When set, players can buy anywhere, not only in buyzones.<br/> `0` disabled.<br/>`1` both teams <br/>`2` only Terrorists team <br/>`3` only CT team |
 | mp_give_player_c4                  | 1       | 0   | 1            | Whether this map should spawn a C4 bomb for a player or not.<br/> `0` disabled<br/>`1` enabled |
 | mp_weapons_allow_map_placed        | 1       | 0   | 1            | When set, map weapons (located on the floor by map) will be shown.<br/> `0` hide all map weapons.<br/>`1` enabled<br/>`NOTE`: Effect will work after round restart. |
-<<<<<<< HEAD
 | mp_dying_time                      | 3.0     | 0.0 | -            | Time for switch to free observing after death.<br/>`0` disabled (instant view switch).<br/>`>0.00001` - time delay to start spectate.<br/>`NOTE`: The countdown starts when the player’s death animation is finished.|
-=======
 | mp_fadetoblack                     | 0       | 0   | 2            | Observer's screen will fade to black on kill event or permanent.<br/> `0` No fade.<br/>`1` Fade to black and won't be able to watch anybody.<br/>`2` fade to black only on kill moment. |
->>>>>>> master
 </details>
 
 ## How to install zBot for CS 1.6?

dist/game.cfg

@@ -375,20 +375,18 @@ mp_give_player_c4 1
 // Default value: "1"
 mp_weapons_allow_map_placed 1
 
-<<<<<<< HEAD
 // Time for switch to free observing after death.
 // NOTE: The countdown starts when the player’s death animation is finished.
 // 0 - disabled (instant view switch)
 // >0.00001 - time delay to start spectate
 //
 // Default value: "3.0"
 mp_dying_time 3.0
-=======
+
 // Observer's screen will fade to black on kill event or permanent.
 // 0 - No fade
 // 1 - Fade to black and won't be able to watch anybody
 // 2 - fade to black only on kill moment.
 //
 // Default value: "0"
 mp_fadetoblack 0
->>>>>>> master