Oops. Left in a conflict marker
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@111 eee81c28-f429-11dd-99c0-75d572ba1dddmaster
parent
6c2958278f
commit
cb15c66a2e
|
@ -744,7 +744,6 @@ function SvgCanvas(c)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
>>>>>>> .r109
|
|
||||||
$(container).mouseup(mouseUp);
|
$(container).mouseup(mouseUp);
|
||||||
$(container).mousedown(mouseDown);
|
$(container).mousedown(mouseDown);
|
||||||
$(container).mousemove(mouseMove);
|
$(container).mousemove(mouseMove);
|
||||||
|
|
Loading…
Reference in New Issue