bugfix [#23062] Resolve conflict button in text editor dissappers in Blener 2.5 beta release

also uncommented console some code for testing by mistake & remove warning.

release/scripts/op/console_python.py

@@ -66,9 +66,9 @@ def get_console(console_id):
 
         # XXX, bug in python 3.1.2 ? (worked in 3.1.1)
         # seems there is no way to clear StringIO objects for writing, have to make new ones each time.
-        # import io
-        # stdout = io.StringIO()
-        # stderr = io.StringIO()
+        import io
+        stdout = io.StringIO()
+        stderr = io.StringIO()
     else:
         if _BPY_MAIN_OWN:
             import types