fix conflicts 6) #__template_styles

joomla · May 7, 2016 · 95ac0fc · 95ac0fc
1 parent 5481af2
commit 95ac0fc
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
@@ -1641,14 +1641,9 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
   `params` text NOT NULL,
   PRIMARY KEY (`id`),
   KEY `idx_template` (`template`),
-<<<<<<< HEAD
   KEY `idx_home` (`home`),
   KEY 'idx_client_id' ('client_id')
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9;
-=======
-  KEY `idx_home` (`home`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=9;
->>>>>>> 5f03cec685fcfbe203457828a24ef41f611eba15
 
 --
 -- Dumping data for table `#__template_styles`