nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next 

Conflicts:
	src/commands.c
This commit is contained in:
Michael Stapelberg 2015-03-07 15:57:41 +01:00
parent 6226400dfd 5fb99ad9f7
commit 0148dc6fd3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands.c
View File

@ -909,7 +909,7 @@ void cmd_append_layout(I3_CMD, char *path) {
LOG("JSON content = %d\n", content); LOG("JSON content = %d\n", content);
if (content == JSON_CONTENT_UNKNOWN) { if (content == JSON_CONTENT_UNKNOWN) {
ELOG("Could not determine the contents of \"%s\", not loading.\n", path); ELOG("Could not determine the contents of \"%s\", not loading.\n", path);
ysuccess(false); yerror("Could not determine the contents of \"%s\".", path);
free(path); free(path);
return; return;
} }