Missed a merge conflict for recent delay change

ianmarmour · Sep 22, 2020 · 2771b28 · 2771b28
1 parent 7d99b61
commit 2771b28
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -38,25 +38,16 @@ type TelegramConfig struct {
 }
 
 type Config struct {
-<<<<<<< HEAD
-	Locale         string
-	Currency       string
+	Locale   string
+	Currency string
+	Delay    int64
+
 	SKU            string
 	TestSKU        string
 	TwilioConfig   TwilioConfig
 	TwitterConfig  TwitterConfig
 	DiscordConfig  DiscordConfig
 	TelegramConfig TelegramConfig
-=======
-	Locale        string
-	Delay         int64
-	Currency      string
-	SKU           string
-	TestSKU       string
-	TwilioConfig  TwilioConfig
-	TwitterConfig TwitterConfig
-	DiscordConfig DiscordConfig
->>>>>>> Added delay parameter so users can manually control delay if required
 }
 
 // Hardcoded SKU to locale/currency mappings to avoid user pain of having to lookup and enter these.