fix changes requested

2020-08-17 21:03:28 +02:00
parent 0f77c17e9c
commit 3439b94e0e
3 changed files with 2 additions and 41 deletions
--- a/config/config.go
+++ b/config/config.go
@ -50,11 +50,7 @@ type UserPreferences struct {
 	DisableHTML          bool `yaml:"disable_html"`
 	DisableDownloads     bool `yaml:"disable_downloads"`
 	DisableNotifications bool `yaml:"disable_notifications"`
-<<<<<<< HEAD
 	DisableShowURLs      bool `yaml:"disable_show_urls"`
-=======
-	DisableShowurls      bool `yaml:"disable_show_urls"`
->>>>>>> 67c0262587404c2b2912e934092dacdba7cc2ed0
 }

 // Config contains the main config of gomuks.