diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 7b393c62..195f2d5a 100644
--- 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);