From a05d4dbe78bc2b94ee9e281c02216deb645125d8 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 19 May 2014 10:30:21 +0200
Subject: [PATCH] Remove debugging code

---
 src/sunstone/public/js/plugins/provision-tab.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js
index 7408e7dd7e..b19b9329bf 100644
--- a/src/sunstone/public/js/plugins/provision-tab.js
+++ b/src/sunstone/public/js/plugins/provision-tab.js
@@ -1462,7 +1462,6 @@ function show_provision_group_info_callback(request, response) {
     $("#provision_info_vdc_group_acct", context),
     {   fixed_group: info.ID,
         init_group_by: "user" });
->>>>>>> feature-2854
 }
 
 function show_provision_create_vm() {