From c771698d5a171cb15ef44d042f42f9c866537934 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@diddyinc.com>
Date: Sun, 5 Aug 2018 08:40:22 -0400
Subject: [PATCH 1/2] Vallimar master (#566)

* Fixes compile issue with builtin config.

* Fix copy-paste mistake.
---
 src/conky.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/conky.cc b/src/conky.cc
index a1c81bee..74d339fe 100644
--- a/src/conky.cc
+++ b/src/conky.cc
@@ -2704,7 +2704,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

From 86acbc56e6170d467d2d068057feb2e90c8d31f8 Mon Sep 17 00:00:00 2001
From: Vallimar <Vallimar@users.noreply.github.com>
Date: Sun, 5 Aug 2018 08:59:57 -0400
Subject: [PATCH 2/2] Fixes compile issue with builtin config. (#563)

* Fixes compile issue with builtin config.

* Fix copy-paste mistake.