mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-09-29 21:49:07 +00:00
Merge branch 'master' into master
This commit is contained in:
commit
2b3fb682aa
@ -2703,7 +2703,9 @@ void load_config_file() {
|
||||
} else {
|
||||
#endif
|
||||
l.loadfile(current_config.c_str());
|
||||
#ifdef BUILD_BUILTIN_CONFIG
|
||||
}
|
||||
#endif
|
||||
} catch (lua::syntax_error &e) {
|
||||
#define SYNTAX_ERR_READ_CONF "Syntax error (%s) while reading config file. "
|
||||
#ifdef BUILD_OLD_CONFIG
|
||||
|
Loading…
Reference in New Issue
Block a user