From e19f176765d8daafa2af9cdf1c8e87441c783e63 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sat, 12 Dec 2015 10:21:22 -0300
Subject: [PATCH] fix broken merge

---
 tools/editor/plugins/script_editor_plugin.cpp |  2 --
 tools/editor/script_editor_debugger.cpp       | 13 -------------
 2 files changed, 15 deletions(-)

diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 4332ba57a3b..df6397ed1d7 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -604,8 +604,6 @@ void ScriptEditor::_breaked(bool p_breaked,bool p_can_debug) {
 void ScriptEditor::_show_debugger(bool p_show) {
 
 	debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), p_show);
-
-	debugger->set_always_visible(p_show);
 }
 
 void ScriptEditor::_script_created(Ref<Script> p_script) {
diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index cd265e3704f..1247760a55a 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -1161,23 +1161,10 @@ void ScriptEditorDebugger:: _error_stack_selected(int p_idx){
 
 }
 
-<<<<<<< HEAD
 void ScriptEditorDebugger::set_hide_on_stop(bool p_hide) {
 
 	hide_on_stop=p_hide;
 }
-=======
-void ScriptEditorDebugger::set_always_visible(bool p_visible) {
-
-	always_visible=p_visible;
-
-	if (p_visible)
-		show();
-	else
-		hide();
-}
-
->>>>>>> c3db5d951c1ee938a0c789c78a9bb8045ef8605b
 
 void ScriptEditorDebugger::_bind_methods() {