remove rebase markings

server/validation/tnc.go

@@ -1,13 +1,15 @@
 package validation
 
 import (
-	"fmt"
+
-	"regexp"
-	"strconv"
 	"time"
+	"fmt"
+	"strconv"
+	"regexp"
 
 	"bitbucket.org/nemt/nemt-portal-api/application/viewmodel"
 	"bitbucket.org/nemt/nemt-portal-api/infra/errors"
+
 )
 
 const (
@@ -36,7 +38,7 @@ func isMixedIDValid(id string) bool {
 	hasLowerCase := false
 	hasNumber := false
 
-	for _, character := range id {
+	for _, character := range (id) {
 		hasUpperCase = hasUpperCase || ((character >= 65) && (character <= 90))
 		hasLowerCase = hasLowerCase || ((character >= 97) && (character <= 122))
 		hasNumber = hasNumber || ((character >= 48) && (character <= 57))
@@ -208,5 +210,6 @@ func ValidateRide(requestRide *viewmodel.RideRequest, user *viewmodel.User) []er
 		result = append (result, errors.ValidationError{Field : "trip_type.key", Message : "Step #4 - Choose a Trip Type"})
 	}
 
+
 	return result
 }