Merge pull request joomla#8 from alikon/patch-65

fix conflicts 4) #__menu
mwatt · May 7, 2016 · 5481af2 · 5481af2
2 parents 9d1b889 + ceddaff
commit 5481af2
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
@@ -1245,18 +1245,11 @@ CREATE TABLE IF NOT EXISTS `#__menu` (
   KEY `idx_componentid` (`component_id`,`menutype`,`published`,`access`),
   KEY `idx_menutype` (`menutype`),
   KEY `idx_left_right` (`lft`,`rgt`),
-<<<<<<< HEAD
-  KEY `idx_alias` (`alias`),
-  KEY `idx_path` (`path`(255)),
-  KEY `idx_language` (`language`),
-  KEY 'idx_client_id_published_lft' ('client_id','published','lft')
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=102;
-=======
   KEY `idx_alias` (`alias`(100)),
   KEY `idx_path` (`path`(100)),
-  KEY `idx_language` (`language`)
+  KEY `idx_language` (`language`),
+  KEY 'idx_client_id_published_lft' ('client_id','published','lft')
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=102;
->>>>>>> 5f03cec685fcfbe203457828a24ef41f611eba15
 
 --
 -- Dumping data for table `#__menu`