merge files together

fix conflict
2020-01-15 15:07:05 +01:00
parent 3b2f65985c
commit ef0b0ef4f7
4 changed files with 236 additions and 251 deletions
--- a/main.go
+++ b/main.go
@@ -34,19 +34,11 @@ 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"
 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!