Oops. Left in a conflict marker

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@111 eee81c28-f429-11dd-99c0-75d572ba1ddd
2009-06-12 06:49:34 +00:00
parent 6c2958278f
commit cb15c66a2e
1 changed files with 0 additions and 1 deletions
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -744,7 +744,6 @@ function SvgCanvas(c)
 		}
 	}
 	
->>>>>>> .r109
 	$(container).mouseup(mouseUp);
 	$(container).mousedown(mouseDown);
 	$(container).mousemove(mouseMove);