From edcc11376e79cc1d2f58f7ff462e03b2d73c308c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 27 Aug 2013 22:15:11 +0200
Subject: [PATCH] Fixed merge error

---
 octoprint/settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/octoprint/settings.py b/octoprint/settings.py
index f1a7370..59ae461 100644
--- a/octoprint/settings.py
+++ b/octoprint/settings.py
@@ -109,8 +109,7 @@ default_settings = {
 	"terminalFilters": [
 		{ "name": "Suppress M105 requests/responses", "regex": "(Send: M105)|(Recv: ok T:)" },
 		{ "name": "Suppress M27 requests/responses", "regex": "(Send: M27)|(Recv: SD printing byte)" }
-	]
-	},
+	],
 	"devel": {
 		"virtualPrinter": {
 			"enabled": False,