Solve conflicts

Author: dschreij

mediadecoder/soundrenderers/sounddevicerenderer.py

@@ -65,4 +65,4 @@ def close_stream(self):
 		""" Closes the stream. Performs cleanup. """
 		self.keep_listening = False
 		self.stream.stop()
-		self.stream.close()
+		self.stream.close()