senaduka/old-svijetlastrana
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

remove rebase markings

Browse Source
This commit is contained in:
GotPPay
2018-05-25 12:26:10 +02:00
parent e63dd2fa38
commit 696a5b7c0a
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/validation/user.go
View File

@@ -1,18 +1,10 @@
package validation package validation
import ( import (
<<<<<<< HEAD
=======
>>>>>>> enforce password policy
"strings" "strings"
"bitbucket.org/nemt/nemt-portal-api/application/viewmodel" "bitbucket.org/nemt/nemt-portal-api/application/viewmodel"
"bitbucket.org/nemt/nemt-portal-api/infra/errors" "bitbucket.org/nemt/nemt-portal-api/infra/errors"
<<<<<<< HEAD
=======
>>>>>>> enforce password policy
) )
func characterIsUpperCase(character rune) bool { func characterIsUpperCase(character rune) bool {