0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the conflicts

Browse source
This commit is contained in:
Bär Halberkamp 2013-11-18 22:32:54 +01:00
parent 623d752952
commit c9a28f977b
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/lan_server.cfg
View file

@ -1,11 +1,5 @@
<<<<<<< HEAD
motd="Welcome to Wesnoth’s LAN server!
This server allows *any* Wesnoth version, so make sure all players have clients with compatible versions! Otherwise, you will run into problems.
This server will automatically shut down after all players have left."
=======
motd="Welcome to Wesnoth’s LAN server!
This server allows *any* wesnoth version, so make sure all players have clients with compatible versions! Otherwise, you will run into problems.
This server will automatically shutdown after all players have left."
>>>>>>> ef73e1d08c1ccc136bb2bf284eb7c038b07b2b04
versions_accepted="*"
lan_server="60"