remove rebase markings

2018-05-25 12:26:10 +02:00
parent 28adda2891
commit c926a791b9
1 changed files with 4 additions and 12 deletions
--- a/server/validation/user.go
+++ b/server/validation/user.go
@@ -1,18 +1,10 @@
 package validation

 import (
-<<<<<<< HEAD
-=======
-
->>>>>>> enforce password policy
 	"strings"

 	"bitbucket.org/nemt/nemt-portal-api/application/viewmodel"
 	"bitbucket.org/nemt/nemt-portal-api/infra/errors"
-<<<<<<< HEAD
-=======
-
->>>>>>> enforce password policy
 )

 func characterIsUpperCase(character rune) bool {