[Mp-plugins-svn] SF.net SVN: mp-plugins: [932] trunk/skins/BlueTwoBig/Development Version/ myHome.xml

[<i-...@us...>]

Revision: 932
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=932&view=rev
Author:   i-loop
Date:     2007-09-16 04:42:51 -0700 (Sun, 16 Sep 2007)

Log Message:
-----------
fixed an error caused by tortoisesvn merge/resolve

Modified Paths:
--------------
    trunk/skins/BlueTwoBig/Development Version/myHome.xml

Modified: trunk/skins/BlueTwoBig/Development Version/myHome.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/myHome.xml	2007-09-16 10:45:58 UTC (rev 931)
+++ trunk/skins/BlueTwoBig/Development Version/myHome.xml	2007-09-16 11:42:51 UTC (rev 932)
@@ -40,12 +40,9 @@
       <animation effect="fade" time="500">WindowClose</animation>
       <animation effect="zoom" start="20,20" end="100,100" center="384,288" time="500">WindowOpen</animation>
       <animation effect="zoom" start="100,100" end="20,20" center="384,288" time="500">WindowClose</animation>
-<<<<<<< .mine
       <!-- 3d Tweening example -->
       <!-- <animation effect="rotatey" start="0" end="20" center="525,0" tween="back" ease="easeout"  time="500">focus</animation> -->
       <!-- <animation effect="rotatey" start="20" end="0" center="525,0"  tween="back" ease="easeout"   time="500">unfocus</animation> -->
-=======
->>>>>>> .r929
       <id>50</id>
       <posX>370</posX>
       <posY>130</posY>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.