From 2a3d9c291d4d0c02c0f98fa7f56cf256da7a4122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 9 Mar 2016 11:54:05 +0100
Subject: [PATCH] Fixed a merge error

---
 src/octoprint/settings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index 38a197f0..afe81c2e 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -85,8 +85,9 @@ default_settings = {
 			"sdStatus": 1
 		},
 		"additionalPorts": [],
-		"longRunningCommands": ["G4", "G28", "G29", "G30", "G32"],
+		"longRunningCommands": ["G4", "G28", "G29", "G30", "G32", "M400", "M226"],
 		"checksumRequiringCommands": ["M110"],
+		"helloCommand": "M110 N0",
 		"disconnectOnErrors": True,
 		"ignoreErrorsFromFirmware": False
 	},