manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Solving git problem

Browse source
This commit is contained in:
Manuel Cillero 2017-08-31 16:49:45 +02:00
commit 5795600dd6
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
themes/zuitedesk/template.php
View file

@ -256,11 +256,17 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
} }
} }
<<<<<<< HEAD
// Guided tour for authenticated users: // Guided tour for authenticated users:
if (user_is_logged_in()) { if (user_is_logged_in()) {
$tour = 'tourmenu'; $tour = 'tourmenu';
drupal_add_js(drupal_get_path('theme', 'zuitedesk') . "/js/$tour.js", 'theme', 'footer', FALSE); 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) { function _zuitedesk_option($access, $url, $text, $id = NULL, $icon = NULL, $message = NULL) {

4
themes/zuitedesk/zuitedesk.info
View file

@ -1,6 +1,10 @@
name = SuiteDesk Theme name = SuiteDesk Theme
description = SuiteDesk Theme Zen. description = SuiteDesk Theme Zen.
<<<<<<< HEAD
version = 0.2.46 version = 0.2.46
=======
version = 0.2.45
>>>>>>> f036f960cad6e57914f725e563b60bca5738540a
screenshot = screenshot.png screenshot = screenshot.png