summaryrefslogtreecommitdiff
path: root/lib/elements/clone.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/elements/clone.py')
-rw-r--r--lib/elements/clone.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/elements/clone.py b/lib/elements/clone.py
index 303c1c2f..d9185012 100644
--- a/lib/elements/clone.py
+++ b/lib/elements/clone.py
@@ -5,13 +5,7 @@
from math import atan, degrees
-<<<<<<< HEAD
-from ..commands import is_command, is_command_symbol
-=======
-import inkex
-
from ..commands import is_command_symbol
->>>>>>> c69b6f5a (* autofill to fillstitch)
from ..i18n import _
from ..svg.path import get_node_transform
from ..svg.svg import find_elements