summaryrefslogtreecommitdiffstats
path: root/pkg/config
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-08-27 18:50:24 +1000
committerJesse Duffield <jessedduffield@gmail.com>2018-08-27 18:50:24 +1000
commita1c6adab59e742adc6d4207fecd41c7fd18ceeca (patch)
tree271a241834ac586141b6ff188fd7ac8c44681c4b /pkg/config
parent540edc0c35e97393d9a01c927f7ac962bcbf6d37 (diff)
parente72d090c5c9e426d11bbcf74f3cf3a32de21d3f5 (diff)
Merge branch 'master' into feature/anonymous-reporting
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/app_config.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index d55393a41..05f164a87 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -101,7 +101,7 @@ func LoadUserConfig() (*viper.Viper, error) {
// LoadDefaultConfig loads in the defaults defined in this file
func LoadDefaultConfig(v *viper.Viper) error {
- defaults := getDefaultConfig()
+ defaults := GetDefaultConfig()
return v.ReadConfig(bytes.NewBuffer(defaults))
}
@@ -139,10 +139,10 @@ func (c *AppConfig) InsertToUserConfig(key, value string) error {
return v.WriteConfig()
}
-func getDefaultConfig() []byte {
- return []byte(`
-gui:
- ## stuff relating to the UI
+func GetDefaultConfig() []byte {
+ return []byte(
+ `gui:
+ # stuff relating to the UI
scrollHeight: 2
theme:
activeBorderColor: