Merge remote-tracking branch 'origin/devel' into devel

2016-10-11 16:35:57 +02:00 · 2016-10-11 16:35:57 +02:00 · 6143985517
commit 6143985517
parent d88bf78242 aeb1970270
1 changed files with 1 additions and 1 deletions
--- a/src/octoprint/daemon.py
+++ b/src/octoprint/daemon.py
@ -172,4 +172,4 @@ class Daemon:

 	@classmethod
 	def error(cls, line):
-		print(line, stream=sys.stderr)
+		print(line, file=sys.stderr)