     @tmp = require('tmp');
 
     @atomPythonTestView.clear()
+<<<<<<< HEAD
 
     # display of panel depends on onlyShowPanelOnFailure
     @onlyShowPanelOnFailure = atom.config.get('atom-python-test.onlyShowPanelOnFailure')

          @atomPythonTestView.destroy()
    else
      @atomPythonTestView.toggle()

    stdout = (output) ->
      atomPythonTestView = AtomPythonTest.atomPythonTestView

    exit = (code) =>
      atomPythonTestView = AtomPythonTest.atomPythonTestView

<<<<<<< HEAD
      if @onlyShowPanelOnFailure and atomPythonTestView.message.includes("success-line") #pytest retrun succes
=======
      if atomPythonTestView.message.includes("success-line") #pytest retrun succes
>>>>>>> 8807b0270b039a665cb2cd8fd0fb0a449bb4f1a1
        statusBar = document.getElementsByClassName('status-bar')[0]
        statusBar.style.background = "green"
        setTimeout ->
