Permalink
Browse files

Layers added for branches

  • Loading branch information...
1 parent 88f8be8 commit 98915bb2ff60d274a42c329596f9eee625751928 @mfasterholdt mfasterholdt committed Apr 29, 2012
Showing with 16 additions and 0 deletions.
  1. +16 −0 settings/settings.xml
View
@@ -179,22 +179,38 @@
<frame duration="0.2" img="plant/floatingPlant01.png" />
</variation>
</sprite>
+<<<<<<< HEAD
<sprite name="branchLeft" margin="5" layer="7">
+=======
+ <sprite name="branchLeft" margin="5" layer="3">
+>>>>>>> Layers added for branches
<variation>
<frame duration="0.2" img="plant/branchLeft01.png" />
</variation>
</sprite>
+<<<<<<< HEAD
<sprite name="branchRight" margin="5" layer="7">
+=======
+ <sprite name="branchRight" margin="5" layer="3">
+>>>>>>> Layers added for branches
<variation>
<frame duration="0.2" img="plant/branchRight01.png" />
</variation>
</sprite>
+<<<<<<< HEAD
<sprite name="vineBranchLeft" margin="5" layer="7">
+=======
+ <sprite name="vineBranchLeft" margin="5" layer="3">
+>>>>>>> Layers added for branches
<variation>
<frame duration="0.2" img="plant/rootBranchLeft01.png" />
</variation>
</sprite>
+<<<<<<< HEAD
<sprite name="vineBranchRight" margin="5" layer="7">
+=======
+ <sprite name="vineBranchRight" margin="5" layer="3">
+>>>>>>> Layers added for branches
<variation>
<frame duration="0.2" img="plant/rootBranchRight01.png" />
</variation>

0 comments on commit 98915bb

Please sign in to comment.