Fixing even more merge issues.

2026-09-16 19:22:42 +00:00 · 2016-12-02 16:55:46 -08:00
parent f7b18e98d6
commit 4ca84b5fee
3 changed files with 2 additions and 261 deletions
@@ -4,15 +4,9 @@ function YPuppetRigTool()
    this.info =
    {
 	name : "yPuppetRig",
-<<<<<<< HEAD
 	version : 0.33,
 	stage : "development",
 	description : "Tools for streamlining puppet-based animation rigs.",
-=======
-	version : 0.1,
-	stage : "development",
-	description : "Tool to create nulls at puppet pin locations, and link the latter to the former.",
->>>>>>> 841484771586f75c140288b329d54c96d3cb3925
 	url : "yorchnet.com"
    };
    this.appearence =