good

Comingle · Nov 24, 2014 · 665ca56 · 665ca56
1 parent dcfd802
commit 665ca56
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/Multivibe_Base/Multivibe_Base.ino b/Multivibe_Base/Multivibe_Base.ino
@@ -83,10 +83,6 @@ void loop() {
 }
 
 
-<<<<<<< HEAD:Multivibe_Base/Multivibe_Base.ino
-
-=======
->>>>>>> FETCH_HEAD:Multivibe_Base.ino
 // Cycle through all the outputs, turn the LED on and leave it on to show that we're on
 void startupSequence() {
   int outs = Toy.device.outCount;
@@ -149,11 +145,6 @@ int* pulse(int seq) {
     step[0] = random(0,3);
     step[1] = 144;
   }
-<<<<<<< HEAD:Multivibe_Base/Multivibe_Base.ino
-
-=======
-
->>>>>>> FETCH_HEAD:Multivibe_Base.ino
   step[2] = 70;
   return step;
 }