try to avoid merge conflict

lourenco-marinho · Dec 3, 2016 · ad0c2fa · ad0c2fa
1 parent 76401a3
commit ad0c2fa
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Source/ActionButton.swift b/Source/ActionButton.swift
@@ -163,10 +163,13 @@ public class ActionButton: NSObject {
         self.floatButton.addConstraints(width)
         self.floatButton.addConstraints(height)
 
-        self.bottomSpacingConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:[floatButton]-15-|", options: NSLayoutFormatOptions.AlignAllCenterX, metrics: nil, views: views)
-        self.trailingSpacingConstraints = NSLayoutConstraint.constraintsWithVisualFormat("H:[floatButton]-15-|", options: NSLayoutFormatOptions.AlignAllCenterX, metrics: nil, views: views)
-        self.parentView.addConstraints(trailingSpacingConstraints)
-        self.parentView.addConstraints(bottomSpacingConstraints)
+        let trailingSpacing = NSLayoutConstraint.constraints(withVisualFormat: "V:[floatButton]-15-|", options: NSLayoutFormatOptions.alignAllCenterX, metrics: nil, views: views)
+        let bottomSpacing = NSLayoutConstraint.constraints(withVisualFormat: "H:[floatButton]-15-|", options: NSLayoutFormatOptions.alignAllCenterX, metrics: nil, views: views)
+        self.parentView.addConstraints(trailingSpacing)
+        self.parentView.addConstraints(bottomSpacing)
+
+        self.trailingSpacingConstraints = trailingSpacing
+        self.bottomSpacingConstraints = bottomSpacing
     }
 
     //MARK: - Button Actions Methods