From 3dc7f8cd7ce78de204e7d67e44574ef402efaa5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 24 Feb 2015 09:35:35 +0100
Subject: [PATCH] Fixed a merge error

---
 src/octoprint/static/js/app/viewmodels/settings.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index 1664a3e6..c2e2e403 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -81,6 +81,12 @@ $(function() {
         self.serial_timeoutSdStatus = ko.observable(undefined);
         self.serial_log = ko.observable(undefined);
 
+        self.folder_uploads = ko.observable(undefined);
+        self.folder_timelapse = ko.observable(undefined);
+        self.folder_timelapseTmp = ko.observable(undefined);
+        self.folder_logs = ko.observable(undefined);
+        self.folder_watched = ko.observable(undefined);
+
         self.scripts_gcode_beforePrintStarted = ko.observable(undefined);
         self.scripts_gcode_afterPrintDone = ko.observable(undefined);
         self.scripts_gcode_afterPrintCancelled = ko.observable(undefined);