Conflict resolution.

Clocker/ApplicationDelegate.m

@@ -76,9 +76,8 @@ void *kContextActivePanel = &kContextActivePanel;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
-<<<<<<< HEAD
     BOOL startedAtLogin = NO;
-=======
+    
     NSNumber *opened = [[NSUserDefaults standardUserDefaults] objectForKey:@"noOfTimes"];
     if (opened == nil)
     {
@@ -89,11 +88,6 @@ void *kContextActivePanel = &kContextActivePanel;
         [[NSUserDefaults standardUserDefaults] setObject:noOfTime forKey:@"noOfTimes"];;
         
     }
-
-    
-    
-    NSArray *defaultPreference = [[NSUserDefaults standardUserDefaults] objectForKey:CLDefaultPreferenceKey];
->>>>>>> master
     
     NSArray *apps = [[NSWorkspace sharedWorkspace] runningApplications];
     
@@ -182,7 +176,7 @@ void *kContextActivePanel = &kContextActivePanel;
     
     NSNumber *showAppInForeground = [[NSUserDefaults standardUserDefaults] objectForKey:CLShowAppInForeground];
     if (showAppInForeground == nil) {
-        [[NSUserDefaults standardUserDefaults] setObject:@1 forKey:CLShowAppInForeground];
+        [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:CLShowAppInForeground];
     }
     
     NSNumber *startClockerAtLogin = [[NSUserDefaults standardUserDefaults] objectForKey:CLStartAtLogin];

Clocker/Clocker-Info.plist

@@ -17,12 +17,8 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-<<<<<<< HEAD
 	<string>22</string>
-=======
+    <key>Fabric</key>
-	<string>17</string>
->>>>>>> master
-	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
 		<string>94088f95c41979e8019b67d5795f52bbbe7104d4</string>

Clocker/PanelController.m

@@ -352,9 +352,6 @@ static PanelController *sharedPanel = nil;
     }
 }
 
-<<<<<<< HEAD
-=======
-
 -(BOOL)tableView:(NSTableView *)tableView acceptDrop:(id<NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation
 {
     if (row == self.defaultPreferences.count) {
@@ -409,5 +406,4 @@ static PanelController *sharedPanel = nil;
     
 }
 
->>>>>>> master
 @end