Correct conflict

Author: mlutter

Validator/PasswordRule.swift

@@ -17,18 +17,11 @@ public class PasswordRule : RegexRule {
     //
     // no length. One uppercase. One lowercae. One number.
     // static let regex = "^(?=.*?[A-Z])(?=.*?[0-9])(?=.*?[a-z]).*?$"
-<<<<<<< HEAD
 
     static let regex = "^(?=.*?[A-Z]).{8,}$"
 
     public convenience init(message : String = "Must be 8 characters with 1 uppercase") {
         self.init(regex: PasswordRule.regex, message : message)
-=======
 
-    static let regex = "^(?=.*?[A-Z]).{8,}$"
-    
-	public convenience init(message : String = "Must be 8 characters with 1 uppercase") {
-		self.init(regex: PasswordRule.regex, message : message)
->>>>>>> upstream/master
     }
 }

Validator/RegexRule.swift

@@ -12,17 +12,10 @@ public class RegexRule : Rule {
 
     private var REGEX: String = "^(?=.*?[A-Z]).{8,}$"
     private var message : String
-<<<<<<< HEAD
 
     public init(regex: String, message: String = "Invalid Regular Expression"){
         self.REGEX = regex
         self.message = message
-=======
-	
-    public init(regex: String, message: String = "Invalid Regular Expression"){
-        self.REGEX = regex
-		self.message = message
->>>>>>> upstream/master
     }
 
     public func validate(value: String) -> Bool {

Validator/ZipCodeRule.swift

@@ -10,12 +10,7 @@ import Foundation
 
 public class ZipCodeRule: RegexRule {
 
-<<<<<<< HEAD
     public convenience init(message : String = "Enter a valid 5 digit zipcode"){
         self.init(regex: "\\d{5}", message : message)
-=======
-	public convenience init(message : String = "Enter a valid 5 digit zipcode"){
-		self.init(regex: "\\d{5}", message : message)
->>>>>>> upstream/master
     }
 }