From 063eac3811781865cd25ebd6fa8c09d55611ccb8 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Thu, 31 Aug 2017 16:51:50 +0200
Subject: [PATCH] Solving git problem

---
 themes/zuitedesk/template.php   | 6 ------
 themes/zuitedesk/zuitedesk.info | 6 +-----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php
index a745c6d..808bc8a 100644
--- a/themes/zuitedesk/template.php
+++ b/themes/zuitedesk/template.php
@@ -256,17 +256,11 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
     }
   }
 
-<<<<<<< HEAD
   // Guided tour for authenticated users:
   if (user_is_logged_in()) {
     $tour = 'tourmenu';
     drupal_add_js(drupal_get_path('theme', 'zuitedesk') . "/js/$tour.js", 'theme', 'footer', FALSE);
   }
-=======
-  // Guided tour:
-  $tour = 'tourmenu';
-  drupal_add_js(drupal_get_path('theme', 'zuitedesk') . "/js/$tour.js", 'theme', 'footer', FALSE);
->>>>>>> f036f960cad6e57914f725e563b60bca5738540a
 }
 
 function _zuitedesk_option($access, $url, $text, $id = NULL, $icon = NULL, $message = NULL) {
diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info
index 5d00658..d3e39da 100644
--- a/themes/zuitedesk/zuitedesk.info
+++ b/themes/zuitedesk/zuitedesk.info
@@ -1,10 +1,6 @@
 name        = SuiteDesk Theme
 description = SuiteDesk Theme Zen.
-<<<<<<< HEAD
-version     = 0.2.46
-=======
-version     = 0.2.45
->>>>>>> f036f960cad6e57914f725e563b60bca5738540a
+version     = 0.2.47
 
 screenshot = screenshot.png