Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

changes

  • Loading branch information...
commit 8a781692bdafbe5999aaeaa9b06412357abb5765 1 parent b6bd815
cnharris authored
View
BIN  Staff.xcodeproj/project.xcworkspace/xcuserdata/christopherharris.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
View
16 Staff/StaffController.m
@@ -133,10 +133,6 @@ - (void)setSpaceTags
- (BOOL)changeScale:(NSArray *)notesFromDataController
{
-<<<<<<< HEAD
-=======
-
->>>>>>> 5bc7e90170fb30c48fce32f36763a6209b1081b8
//Return false if array is not normalized properly
if(notesFromDataController.count != NUMBER_OF_NOTES + 1){
NSLog(@" Recieved this number of notes: %@", [notesFromDataController count]);
@@ -163,24 +159,12 @@ - (BOOL)changeScale:(NSArray *)notesFromDataController
//For each, display flat/sharp if value -1/1
for(int pos = 1; pos <= NUMBER_OF_NOTES; pos++)
{
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
NSLog(@"note value: %d",[[notesFromDataController objectAtIndex:pos] intValue]);
-=======
- //NSLog(@"note value: %d",[[notesFromDataController objectAtIndex:pos] intValue]);
->>>>>>> f5ed49c40e650bb16463ed1d9712028f24f44d5f
-
->>>>>>> 5bc7e90170fb30c48fce32f36763a6209b1081b8
num = [[notesFromDataController objectAtIndex:pos] intValue];
if(num != 0){
-<<<<<<< HEAD
//Add +1 to pos becase tag attributes of lines/spaces start at 1
[self setFlatOrSharpOnSpecificLineOrSpace:num withNotePosition:pos+1];
[self findAccidentalNote:pos+1];
-=======
- [self setFlatOrSharpOnSpecificLineOrSpace:num withNotePosition:pos];
->>>>>>> 5bc7e90170fb30c48fce32f36763a6209b1081b8
}
}
return TRUE;
Please sign in to comment.
Something went wrong with that request. Please try again.