From 44f5fa94ea4a9af1a140be09a1ff658a636cff45 Mon Sep 17 00:00:00 2001
From: Alex Kotliarskyi <alex.frantic@gmail.com>
Date: Thu, 26 Mar 2015 11:42:38 -0400
Subject: [PATCH] Remove .rej file

---
 .../UIExplorer.xcodeproj/project.pbxproj.rej  | 72 -------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej

diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej
deleted file mode 100644
index fa002c8b0..000000000
--- a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej
+++ /dev/null
@@ -1,72 +0,0 @@
-diff a/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj	(rejected hunks)
-@@ -19,6 +19,7 @@
- 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
- 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
- 		147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; };
-+		D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
- /* End PBXBuildFile section */
- 
- /* Begin PBXContainerItemProxy section */
-@@ -78,6 +79,13 @@
- 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
- 			remoteInfo = RCTActionSheet;
- 		};
-+		D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */ = {
-+			isa = PBXContainerItemProxy;
-+			containerPortal = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
-+			proxyType = 2;
-+			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
-+			remoteInfo = RCTVibration;
-+		};
- /* End PBXContainerItemProxy section */
- 
- /* Begin PBXFileReference section */
-@@ -98,6 +106,7 @@
- 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 		14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
-+		D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
- /* End PBXFileReference section */
- 
- /* Begin PBXFrameworksBuildPhase section */
-@@ -112,6 +121,7 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
-+				D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
- 				147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */,
- 				134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
- 				134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
-@@ -145,6 +155,7 @@
- 		1316A21D1AA397F400C0188E /* Libraries */ = {
- 			isa = PBXGroup;
- 			children = (
-+				D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
- 				14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */,
- 				13417FFA1AA91531003F314A /* ReactKit.xcodeproj */,
- 				134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
-@@ -334,6 +353,10 @@
- 					ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */;
- 				},
- 				{
-+					ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */;
-+					ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
-+				},
-+				{
- 					ProductGroup = 13417FFB1AA91531003F314A /* Products */;
- 					ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */;
- 				},
-@@ -396,6 +419,13 @@
- 			remoteRef = 147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */;
- 			sourceTree = BUILT_PRODUCTS_DIR;
- 		};
-+		D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */ = {
-+			isa = PBXReferenceProxy;
-+			fileType = archive.ar;
-+			path = libRCTVibration.a;
-+			remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */;
-+			sourceTree = BUILT_PRODUCTS_DIR;
-+		};
- /* End PBXReferenceProxy section */
- 
- /* Begin PBXResourcesBuildPhase section */