From b6a08a19c8c06debaff53d94ddc991002080b02c Mon Sep 17 00:00:00 2001
From: DengYun <dengyun@meideng.net>
Date: Fri, 16 Aug 2019 17:01:01 +0800
Subject: [PATCH] fix merge conflict

---
 ios/RCTHotUpdate/RCTHotUpdate.m | 4 ----
 package.json                    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ios/RCTHotUpdate/RCTHotUpdate.m b/ios/RCTHotUpdate/RCTHotUpdate.m
index ba160e6..dca187f 100644
--- 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];
diff --git a/package.json b/package.json
index 2c12ead..7ccf338 100644
--- 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": {