Skip to content
Snippets Groups Projects
Commit 66f0ac48 authored by ColinDrieu's avatar ColinDrieu
Browse files

Correction probleme de Merge

parent 0215ea47
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
resources/Terrains.xml
+ 1
− 1
View file @ 66f0ac48
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
</Terrain> </Terrain>
<Terrain id="G_RIVER" name="Riviere" FR="0" FRS="1" PDR="1" Desc="River, arrete de river" f_default="../resources/Skins/eau.bmp"> <Terrain id="G_RIVER" name="Riviere" FR="0" FRS="1" PDR="1" Desc="River, arrete de river" f_default="../resources/Skins/eau.bmp">
</Terrain> </Terrain>
<Terrain id="G_FOREST" name="Foret" FR="1" FRS="0" PDR="2" Desc="Le frère de Fopart" f_default="../resources/Skins/foret.bmp"> <Terrain id="G_FOREST" name="Foret" FR="1" FRS="1" PDR="2" Desc="Le frère de Fopart" f_default="../resources/Skins/foret.bmp">
</Terrain> </Terrain>
<Terrain id="G_MOUNT" name="Montagne" FR="0" FRS="0" PDR="0" Desc="Montagne est plus haut que tontagne" f_default="../resources/Skins/montagne.bmp"> <Terrain id="G_MOUNT" name="Montagne" FR="0" FRS="0" PDR="0" Desc="Montagne est plus haut que tontagne" f_default="../resources/Skins/montagne.bmp">
</Terrain> </Terrain>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment