From d5745628dec09c909d162eaea722303e604b04e0 Mon Sep 17 00:00:00 2001
From: Blaine
Date: Wed, 3 Jun 2020 14:19:08 +0530
Subject: fix2

---
 src/main/python/shapes/shapes.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/main/python')

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):
     """
-- 
cgit