From efed693d2248e622793ab366f19b40955f7497c4 Mon Sep 17 00:00:00 2001
From: xwenliang <wenliang.web@gmail.com>
Date: Mon, 26 Dec 2016 20:03:23 +0800
Subject: [PATCH] resolve conflict

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

diff --git a/ios/RCTBEEPickerManager/BzwPicker.m b/ios/RCTBEEPickerManager/BzwPicker.m
index 245a3c9..fc7003b 100755
--- a/ios/RCTBEEPickerManager/BzwPicker.m
+++ b/ios/RCTBEEPickerManager/BzwPicker.m
@@ -85,11 +85,7 @@
     
     [view addSubview:cenLabel];
     
-<<<<<<< HEAD
     self.pick = [[UIPickerView alloc] initWithFrame:CGRectMake(0, 40, self.frame.size.width, self.frame.size.height - 40)];
-=======
-    self.pick = [[UIPickerView alloc] initWithFrame:CGRectMake(-5, 40, self.frame.size.width+5, self.frame.size.height - 40)];
->>>>>>> dfafe73491181099295072df68b4d0ebb18d38a8
     
     self.pick.delegate = self;
     self.pick.dataSource = self;
diff --git a/package.json b/package.json
index 6219b50..d5be6ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-picker",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "description": "",
   "main": "index.js",
   "scripts": {
-- 
2.26.2