enforce password policy

2018-05-15 15:47:58 +02:00
parent d8737a558b
commit 58635f81fc
1 changed files with 8 additions and 0 deletions
--- a/server/validation/user.go
+++ b/server/validation/user.go
@@ -1,10 +1,18 @@
 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 {