From cb15c66a2ee8b19e10e422d3b9e14ef5150394ce Mon Sep 17 00:00:00 2001
From: Vidar Hokstad <vidar.hokstad@gmail.com>
Date: Fri, 12 Jun 2009 06:49:34 +0000
Subject: [PATCH] Oops. Left in a conflict marker

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@111 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/svgcanvas.js | 1 -
 1 file changed, 1 deletion(-)

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);