diff options
| -rw-r--r-- | src/main/python/shapes/shapes.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py index c2d79e4..3237e72 100644 --- a/src/main/python/shapes/shapes.py +++ b/src/main/python/shapes/shapes.py @@ -14,10 +14,6 @@ from utils.app import fileImporter from .line import Line from utils.app import fileImporter -<<<<<<< HEAD - -======= ->>>>>>> upstream/master class GripItem(QGraphicsPathItem): """ |