From ab64f7b9e831162d31793bebaaa58beaa2165dd6 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 18 Jul 2017 14:33:58 -0700
Subject: [PATCH] [0.48.0-rc.1] Bump version numbers

---
 ReactAndroid/gradle.properties     | 2 +-
 blog/2016-12-05-easier-upgrades.md | 9 ---------
 package.json                       | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 8b09412ffa2..df38d4c6dbb 100644
--- 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
index 955bd6f2131..d14d6d44ef1 100644
--- 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
index e69378c9fc9..72432c7a9d7 100644
--- 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": {