aboutsummaryrefslogtreecommitdiffstats
path: root/config.go
diff options
context:
space:
mode:
authorTeddy Wing2017-06-03 21:53:59 +0200
committerTeddy Wing2017-06-03 21:53:59 +0200
commite1a82a29c15416d8d2ebab6cbd831354d3cb1595 (patch)
treed67a067372e3848d440b03b2d81a22518ccd7bbf /config.go
parentaff5d59c5bf300e0fd706cff626c26fdd5ce0695 (diff)
parent60b5500b88e9b2b04807d947f943412b99cc09d9 (diff)
downloadtimetasker-e1a82a29c15416d8d2ebab6cbd831354d3cb1595.tar.bz2
Merge branch 'load-from-xdg-config' into timetasker-daily
Diffstat (limited to 'config.go')
-rw-r--r--config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.go b/config.go
index 43f7689..126b123 100644
--- a/config.go
+++ b/config.go
@@ -67,7 +67,7 @@ func maybeWriteConfig() error {
func loadConfig() error {
config = Config{}
- _, err := toml.DecodeFile("config2.toml", &config)
+ _, err := toml.DecodeFile(configFile(), &config)
if err != nil {
return err
}