fixed conflicts

Author: nicolaschengdev

WYPopoverController/WYPopoverController.h

@@ -72,6 +72,7 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
 @property (nonatomic, assign) CGFloat  minOuterCornerRadius UI_APPEARANCE_SELECTOR;
 
 @property (nonatomic, strong) UIColor *innerShadowColor UI_APPEARANCE_SELECTOR;
+@property (nonatomic, strong) UIColor *innerStrokeColor UI_APPEARANCE_SELECTOR;
 @property (nonatomic, assign) CGFloat  innerShadowBlurRadius UI_APPEARANCE_SELECTOR;
 @property (nonatomic, assign) CGSize   innerShadowOffset UI_APPEARANCE_SELECTOR;
 @property (nonatomic, assign) CGFloat  innerCornerRadius UI_APPEARANCE_SELECTOR;

WYPopoverController/WYPopoverController.m

@@ -264,6 +264,7 @@ @interface WYPopoverInnerView : UIView
 @property (nonatomic, assign) CGFloat  gradientTopPosition;
 
 @property (nonatomic, strong) UIColor *innerShadowColor;
+@property (nonatomic, strong) UIColor *innerStrokeColor;
 @property (nonatomic, assign) CGSize   innerShadowOffset;
 @property (nonatomic, assign) CGFloat  innerShadowBlurRadius;
 @property (nonatomic, assign) CGFloat  innerCornerRadius;
@@ -288,6 +289,7 @@ @implementation WYPopoverInnerView
 @synthesize gradientTopPosition;
 
 @synthesize innerShadowColor;
+@synthesize innerStrokeColor;
 @synthesize innerShadowOffset;
 @synthesize innerShadowBlurRadius;
 @synthesize innerCornerRadius;
@@ -354,7 +356,7 @@ - (void)drawRect:(CGRect)rect
 
         UIBezierPath* inRoundedRectPath = [UIBezierPath bezierPathWithRoundedRect:CGRectInset(innerRect, 0.5, 0.5) cornerRadius:cornerRadius];
 
-        [self.strokeColor setStroke];
+        [self.innerStrokeColor setStroke];
         inRoundedRectPath.lineWidth = 1;
         [inRoundedRectPath stroke];
     }
@@ -369,6 +371,7 @@ - (void)dealloc
 {
     strokeColor = nil;
     innerShadowColor = nil;
+    innerStrokeColor = nil;
     gradientTopColor = nil;
     gradientBottomColor = nil;
 }
@@ -517,6 +520,7 @@ @implementation WYPopoverBackgroundView
 @synthesize outerCornerRadius;
 @synthesize minOuterCornerRadius;
 @synthesize innerShadowColor;
+@synthesize innerStrokeColor;
 @synthesize innerShadowBlurRadius;
 @synthesize innerShadowOffset;
 @synthesize innerCornerRadius;
@@ -540,6 +544,7 @@ + (void)load
         {
             appearance.tintColor = nil;
             appearance.strokeColor = nil;
+            appearance.innerStrokeColor = nil;
             appearance.fillTopColor = nil;
             appearance.fillBottomColor = nil;
             appearance.glossShadowColor = nil;
@@ -563,6 +568,7 @@ + (void)load
         {
             appearance.tintColor = nil;
             appearance.strokeColor = [UIColor clearColor];
+            appearance.innerStrokeColor = [UIColor clearColor];
             appearance.fillTopColor = nil;
             appearance.fillBottomColor = nil;
             appearance.glossShadowColor = nil;
@@ -699,6 +705,7 @@ - (void)setViewController:(UIViewController *)viewController
         innerView.gradientBottomColor = self.fillBottomColor;
         innerView.strokeColor = self.strokeColor;
         innerView.innerShadowColor = innerShadowColor;
+        innerView.innerStrokeColor = innerStrokeColor;
         innerView.innerShadowOffset = innerShadowOffset;
         innerView.innerCornerRadius = self.innerCornerRadius;
         innerView.innerShadowBlurRadius = innerShadowBlurRadius;
@@ -1183,6 +1190,7 @@ - (void)dealloc
     glossShadowColor = nil;
     outerShadowColor = nil;
     innerShadowColor = nil;
+    innerStrokeColor = nil;
 }
 
 @end
@@ -1358,6 +1366,7 @@ - (void)presentPopoverFromRect:(CGRect)aRect inView:(UIView *)aView permittedArr
         containerView.outerCornerRadius = appearance.outerCornerRadius;
         containerView.minOuterCornerRadius = appearance.minOuterCornerRadius;
         containerView.innerShadowColor = appearance.innerShadowColor;
+        containerView.innerStrokeColor = appearance.innerStrokeColor;
         containerView.innerShadowBlurRadius = appearance.innerShadowBlurRadius;
         containerView.innerShadowOffset = appearance.innerShadowOffset;
         containerView.innerCornerRadius = appearance.innerCornerRadius;