Merge pull request joomla#7 from alikon/patch-64

fix conflicts 3) #__languages
mwatt · May 7, 2016 · 9d1b889 · 9d1b889
2 parents 08e3f51 + c87ebfa
commit 9d1b889
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
@@ -1198,14 +1198,9 @@ CREATE TABLE IF NOT EXISTS `#__languages` (
   UNIQUE KEY `idx_image` (`image`),
   UNIQUE KEY `idx_langcode` (`lang_code`),
   KEY `idx_access` (`access`),
-<<<<<<< HEAD
   KEY `idx_ordering` (`ordering`),
   KEY 'idx_published_ordering' ('published','ordering')
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
-=======
-  KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
->>>>>>> 5f03cec685fcfbe203457828a24ef41f611eba15
 
 --
 -- Dumping data for table `#__languages`