diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index d8612ee..b6e7177 100644
Binary files a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate and b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Clocker/ApplicationDelegate.m b/Clocker/ApplicationDelegate.m
index aad6fb8..4551fcc 100755
--- a/Clocker/ApplicationDelegate.m
+++ b/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];
diff --git a/Clocker/Clocker-Info.plist b/Clocker/Clocker-Info.plist
index 6cd12d9..42f814d 100755
--- a/Clocker/Clocker-Info.plist
+++ b/Clocker/Clocker-Info.plist
@@ -17,12 +17,8 @@
CFBundleSignature
????
CFBundleVersion
-<<<<<<< HEAD
22
-=======
- 17
->>>>>>> master
- Fabric
+ Fabric
APIKey
94088f95c41979e8019b67d5795f52bbbe7104d4
diff --git a/Clocker/PanelController.m b/Clocker/PanelController.m
index 94e56a2..011c0fc 100755
--- a/Clocker/PanelController.m
+++ b/Clocker/PanelController.m
@@ -352,9 +352,6 @@ static PanelController *sharedPanel = nil;
}
}
-<<<<<<< HEAD
-=======
-
-(BOOL)tableView:(NSTableView *)tableView acceptDrop:(id)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation
{
if (row == self.defaultPreferences.count) {
@@ -409,5 +406,4 @@ static PanelController *sharedPanel = nil;
}
->>>>>>> master
@end