fix another conflict

btc-raspberrypiclub · Apr 4, 2024 · 6ff66e6 · 6ff66e6
1 parent 52aedcc
commit 6ff66e6
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/button.py b/button.py
@@ -10,19 +10,13 @@ def __init__(self):
 
         #Setup pins and board
         gpio.setmode(gpio.BCM)
-<<<<<<< HEAD
         #Pin 22 is Team 2
         gpio.setup(22, gpio.IN, pull_up_down=gpio.PUD_DOWN)
         #Pin 4 is Team 3
         gpio.setup(4, gpio.IN, pull_up_down=gpio.PUD_DOWN)
         #Pin 17 is Team 1
         gpio.setup(17, gpio.IN, pull_up_down=gpio.PUD_DOWN)
         #GPIO Needs to be setup between 3.3v and pins above
-=======
-        gpio.setup(22, gpio.IN, pull_up_down=gpio.PUD_DOWN)
-        gpio.setup(4, gpio.IN, pull_up_down=gpio.PUD_DOWN)
-        gpio.setup(17, gpio.IN, pull_up_down=gpio.PUD_DOWN)
->>>>>>> master
 
         #Put pins in variables
         self.center_button = 22