Commit e64e5dae authored by Chris Scott's avatar Chris Scott

Merge branch 'persistence-locking' into edge

parents 6560c37b 6da22677
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
@interface TSLocationManager : NSObject <CLLocationManagerDelegate> @interface TSLocationManager : NSObject <CLLocationManagerDelegate>
@property (nonatomic) CLLocationDistance odometer;
- (void) configure:(NSDictionary*)config; - (void) configure:(NSDictionary*)config;
- (void) start; - (void) start;
- (void) stop; - (void) stop;
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<dict> <dict>
<key>Headers/TSLocationManager.h</key> <key>Headers/TSLocationManager.h</key>
<data> <data>
cDmPMOfd6jEG9Kg62Au0tnkrqWA= uXAE4LxGF9ekkpUCvnRgTZf4wvM=
</data> </data>
<key>Info.plist</key> <key>Info.plist</key>
<data> <data>
xolLvzV3rJusVEx/xOJXBAgSQRw= 1G+AqP61j6Sq6MmsyYP98Uqa1/Y=
</data> </data>
<key>Modules/module.modulemap</key> <key>Modules/module.modulemap</key>
<data> <data>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<dict> <dict>
<key>Headers/TSLocationManager.h</key> <key>Headers/TSLocationManager.h</key>
<data> <data>
cDmPMOfd6jEG9Kg62Au0tnkrqWA= uXAE4LxGF9ekkpUCvnRgTZf4wvM=
</data> </data>
<key>Modules/module.modulemap</key> <key>Modules/module.modulemap</key>
<data> <data>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment