[0.48.0-rc.1] Bump version numbers

facebook · Aug 16, 2017 · ab64f7b · ab64f7b
1 parent 96b32d7
commit ab64f7b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.48.0-rc.0
+VERSION_NAME=0.48.0-rc.1
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

diff --git a/blog/2016-12-05-easier-upgrades.md b/blog/2016-12-05-easier-upgrades.md
@@ -82,16 +82,7 @@ All we need now is to apply this patch to your source files. While the old `reac
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-<<<<<<< ours
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/HockeySDK.embeddedframework",
-					"$(PROJECT_DIR)/HockeySDK-iOS/HockeySDK.embeddedframework",
-				);
-=======
 				CURRENT_PROJECT_VERSION = 1;
->>>>>>> theirs
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.48.0-rc.0",
+  "version": "0.48.0-rc.1",
   "description": "A framework for building native apps using React",
   "license": "BSD-3-Clause",
   "repository": {