diff options
| author | Blaine | 2020-06-03 14:19:08 +0530 |
|---|---|---|
| committer | Blaine | 2020-06-03 14:19:08 +0530 |
| commit | d5745628dec09c909d162eaea722303e604b04e0 (patch) | |
| tree | 7cfa508869da352976722b0de25ec9903601bd42 /src/main/python | |
| parent | b11700f84b71c679d9d5fc31d44eb6173fab8871 (diff) | |
| download | Chemical-PFD-d5745628dec09c909d162eaea722303e604b04e0.tar.gz Chemical-PFD-d5745628dec09c909d162eaea722303e604b04e0.tar.bz2 Chemical-PFD-d5745628dec09c909d162eaea722303e604b04e0.zip | |
fix2
Diffstat (limited to 'src/main/python')
| -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): """ |