Merge branch 'master' into next

[i3/i3] / include / load_layout.h

diff --git a/include/load_layout.h b/include/load_layout.h
index 282512b2454e1be458e40d41538a2473817dd6d4..0a5328fafc31f601b12a2d032b089bcf96979ea0 100644 (file)
--- a/include/load_layout.h
+++ b/include/load_layout.h
@@ -8,9 +8,6 @@
  *                restart.
  *
  */
-#ifndef I3_LOAD_LAYOUT_H
-#define I3_LOAD_LAYOUT_H
+#pragma once
 
-void tree_append_json(const char *filename);
-
-#endif
+void tree_append_json(const char *filename, char **errormsg);