From d9ec48278cde793624c58fc135cc73ed25382e63 Mon Sep 17 00:00:00 2001
From: gaoyu <gaoyuexit@163.com>
Date: Thu, 26 Oct 2017 16:50:38 +0800
Subject: [PATCH] resolve conflict

---
 LPAlbum/Others/Extensions.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LPAlbum/Others/Extensions.swift b/LPAlbum/Others/Extensions.swift
index e150cee..b469219 100644
--- a/LPAlbum/Others/Extensions.swift
+++ b/LPAlbum/Others/Extensions.swift
@@ -129,7 +129,7 @@ extension CGSize {
 var keyHitThstEdgeInsets = "HitTestEdgeInsets"
 extension UIControl {
     
-    public var lp_hitEdgeInsets: UIEdgeInsets? {
+   var lp_hitEdgeInsets: UIEdgeInsets? {
         get {
             let value = objc_getAssociatedObject(self, &keyHitThstEdgeInsets) as? NSValue
             return value.map { $0.uiEdgeInsetsValue }