Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
gaoyuexit committed Oct 26, 2017
1 parent 1f8e92e commit d9ec482
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion LPAlbum/Others/Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down

0 comments on commit d9ec482

Please sign in to comment.