From 6b8c92c6b3f5fa7959a2c8927f82b60d6c18938b Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alex@artica.es>
Date: Tue, 24 May 2016 16:33:32 +0200
Subject: [PATCH] Error fix

---
 pandora_console/include/javascript/pandora.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index eff742b265..e5bafb01f6 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1021,6 +1021,7 @@ function toggle_full_value(id) {
 			background: "black"
 		}
 	});
+}
 
 /**
  * Auto hides an element and shows it
@@ -1073,5 +1074,4 @@ var autoHideElement = function (element, hideTime) {
 	
 	// Start hide
 	startHideTimeout(hideTime);
->>>>>>> 8d69c50... Added a function to easily made a control which only appear on mouse move
 }