resolve conflicts

2020-01-23 22:28:29 +01:00
parent b60801c68c c0e9b8f319
commit e1eee69540
17 changed files with 154 additions and 14 deletions
--- a/src/targets/RightDropTarget.py
+++ b/src/targets/RightDropTarget.py
@@ -1,8 +1,8 @@
-from Target import Target
-
-class RightDropTarget(Target):
-    def __init__(self):
-        super(100, 'Right Drop Target')
-
-    def hit(self):
+from Target import Target
+
+class RightDropTarget(Target):
+    def __init__(self):
+        super(100, 'Right Drop Target')
+
+    def hit(self):
        super.hit()