update some typos and missing data

main.go

@@ -32,14 +32,21 @@ func init() {
 development_mode: true
 cronjob_interval: "@every 5m"
 no_run_on_start: false
-http_useragent: Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19
-	(KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19
+http_useragent: "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19	(KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19"
 webhooks:
+<<<<<<< HEAD
 	live:
 	- https://discordapp.com/api/webhooks/...
 	- https://discordapp.com/api/webhooks/...
 	devel:
 	- https://discordapp.com/api/webhooks/...
+=======
+  live:
+  - https://discordapp.com/api/webhooks/...
+  - https://discordapp.com/api/webhooks/...
+  devel:
+  - https://discordapp.com/api/webhooks/...
+>>>>>>> 49d60f1... update some typos and missing data
 comment_on_posts:
 - TY
 - ty!
@@ -51,8 +58,8 @@ comment_on_posts:
 - Yeah!
 - Vielen Dank!
 login:
-	email: example@example.com
-	passwd: thefbpassword
+  email: example@example.com
+  passwd: thefbpassword	
 `)
 
 			viper.ReadConfig(bytes.NewBuffer(yamlExample))