Fix merge issue

Author: perseoGI

conan/api/output.py

@@ -175,7 +175,7 @@ def write(self, data, fg=None, bg=None, newline=False):
 
         return self
 
-    def _write_message(self, msg, fg=None, bg=None):
+    def _write_message(self, msg, fg=None, bg=None, newline=True):
         if isinstance(msg, dict):
             # For traces we can receive a dict already, we try to transform then into more natural
             # text
@@ -195,6 +195,13 @@ def _write_message(self, msg, fg=None, bg=None):
         else:
             ret += "{}".format(msg)
 
+        if newline:
+            ret = "%s\n" % ret
+
+        with self.lock:
+            self.stream.write(ret)
+            self.stream.flush()
+
     def trace(self, msg):
         if self._conan_output_level <= LEVEL_TRACE:
             self._write_message(msg, fg=Color.BLUE)