fix merge conflict

2019-08-16 17:01:01 +08:00 · 2019-08-16 17:01:01 +08:00 · b6a08a19c8
commit b6a08a19c8
parent ef53716df3
2 changed files with 1 additions and 5 deletions
--- a/ios/RCTHotUpdate/RCTHotUpdate.m
+++ b/ios/RCTHotUpdate/RCTHotUpdate.m
@ -145,10 +145,6 @@ RCT_EXPORT_MODULE(RCTHotUpdate);
 	return NO;
 }

- (void)init {
-
-}
-
 - (NSDictionary *)constantsToExport
 {
    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "react-native-update",
-  "version": "5.2.2",
+  "version": "5.2.3",
  "description": "react-native hot update",
  "main": "lib/index.js",
  "scripts": {