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

Forgot to solve a svn conflict.

Browse source
This commit is contained in:
Fabian Müller 2010-02-08 15:10:21 +00:00
parent 502256068d
commit 10c9b103ec
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
View file

@ -2,23 +2,14 @@
#ifdef MULTIPLAYER
[multiplayer]
<<<<<<< .mine
name=_ "Legend of Wesmere"
=======
id=wesbench_Legend_of_Wesmere
name= "Wesnoth Benchmark: The Legend of Wesmere" # Not translatable at the moment
>>>>>>> .r41075
#else
[scenario]
id=01_The_Uprooting
name=_ "The Uprooting"
#endif
<<<<<<< .mine
id=01_The_Uprooting
=======
>>>>>>> .r41075
{LOW_MAP Lintanir.map}
{LOW_MASK 01_Uprooting.mask}