From 912fcd16a8b47541d7a8a1768a3e3dc5b3dac220 Mon Sep 17 00:00:00 2001 From: Pantelis Sampaziotis Date: Sun, 9 Feb 2020 19:30:16 +0200 Subject: [PATCH] resovle conflict --- translations/en/en_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/translations/en/en_test.go b/translations/en/en_test.go index 39567b6..2b113c6 100644 --- a/translations/en/en_test.go +++ b/translations/en/en_test.go @@ -141,13 +141,10 @@ func TestTranslations(t *testing.T) { UniqueSlice []string `validate:"unique"` UniqueArray [3]string `validate:"unique"` UniqueMap map[string]string `validate:"unique"` -<<<<<<< HEAD JSONString string `validate:"json"` LowercaseString string `validate:"lowercase"` UppercaseString string `validate:"uppercase"` -======= Datetime string `validate:"datetime=2006-01-02"` ->>>>>>> Add datetime validation } var test Test