You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
>>>>>>> Added a timer to the datafile manager to periodically download the datafile. Also moved the datafile manager protocol to core as the core should have a basic datafile downloader (the network classes will be moved to core as well in another commit.). Cleaned up the headers and was being more deligent about alphabetizing imports and initializing modules.
OPTLYLogInfo(@"Datafile for project ID %@ downloaded. Saving datafile.");
140
-
}
141
-
else {
142
-
// TODO: Josh W. handle bad response
143
-
}
144
-
// call the completion handler
145
-
if (completion != nil) {
146
-
completion(data, response, error);
147
-
}
148
-
}];
149
-
>>>>>>> Added a timer to the datafile manager to periodically download the datafile. Also moved the datafile manager protocol to core as the core should have a basic datafile downloader (the network classes will be moved to core as well in another commit.). Cleaned up the headers and was being more deligent about alphabetizing imports and initializing modules.
Copy file name to clipboardExpand all lines: OptimizelySDKShared/OptimizelySDKShared/OptimizelySDKShared.h
+1-15Lines changed: 1 addition & 15 deletions
Original file line number
Diff line number
Diff line change
@@ -16,31 +16,17 @@
16
16
17
17
#import<OptimizelySDKCore/OptimizelySDKCore.h>
18
18
#import"OPTLYClient.h"
19
-
<<<<<<< HEAD
20
19
#import"OPTLYClientBuilder.h"
21
-
#import"OPTLYDataStore.h"
22
-
=======
23
-
>>>>>>> Added a timer to the datafile manager to periodically download the datafile. Also moved the datafile manager protocol to core as the core should have a basic datafile downloader (the network classes will be moved to core as well in another commit.). Cleaned up the headers and was being more deligent about alphabetizing imports and initializing modules.
24
20
#if TARGET_OS_IOS
25
21
#import"OPTLYDatabase.h"
26
22
#import"OPTLYDatabaseEntity.h"
27
23
#endif
28
-
<<<<<<< HEAD
29
-
#import"OPTLYFileManager.h"
30
-
#import"OPTLYHTTPRequestManager.h"
31
-
#import"OPTLYManager.h"
32
-
#import"OPTLYManagerBuilder.h"
33
-
#import"OPTLYNetworkService.h"
34
-
35
-
36
-
37
-
=======
38
24
#import"OPTLYDataStore.h"
39
25
#import"OPTLYFileManager.h"
40
26
#import"OPTLYHTTPRequestManager.h"
41
27
#import"OPTLYManager.h"
28
+
#import"OPTLYManagerBuilder.h"
42
29
#import"OPTLYNetworkService.h"
43
-
>>>>>>> Added a timer to the datafile manager to periodically download the datafile. Also moved the datafile manager protocol to core as the core should have a basic datafile downloader (the network classes will be moved to core as well in another commit.). Cleaned up the headers and was being more deligent about alphabetizing imports and initializing modules.
44
30
45
31
//! Project version number for OptimizelySDKShared.
0 commit comments