Fix some merge errors.

src/views/GuitarScene/GuitarScene.py

@@ -3251,9 +3251,9 @@ def neckIntro(self):
                 if self.countdown > 0: #if the countdown is already at 0 ex. after pause
                     self.countdownOK = True
                     self.boardY = 1
-          elif self.boardY > 1:
-              self.boardY -= 0.01 #speed of animation higher the number = the faster the animation
-              self.setCamera()
+            elif self.boardY > 1:
+                self.boardY -= 0.01 #speed of animation higher the number = the faster the animation
+                self.setCamera()
         elif self.neckintroAnimationType == 1 or (self.neckintroAnimationType == 4 and self.neckintroThemeType == "guitar hero"): #Guitar Hero
             if self.boardY <= 1:
                 self.setCamera()

src/views/GuitarScene/instruments/Guitar.py

@@ -442,7 +442,7 @@ def getDoubleNotes(self, notes):
                     noteCount += 1
         return sorted(notes, key=lambda x: x[0])
 
-  def controlsMatchNotes(self, controls, notes, hopo = False):
+    def controlsMatchNotes(self, controls, notes, hopo = False):
         # no notes?
         if not notes:
             return False
@@ -498,13 +498,13 @@ def controlsMatchNotes(self, controls, notes, hopo = False):
         else:
             self.missedNotes = []
 
-    for time, note in self.missedNotes:
-        note.skipped = True
-        note.played = False
-        if twochord == 2:
-            self.twoChord += skipped
+        for time, note in self.missedNotes:
+            note.skipped = True
+            note.played = False
+            if twochord == 2:
+                self.twoChord += skipped
 
-        return True
+            return True
 
     def uniqify(self, seq, idfun=None):
         # order preserving