fixing wrongly solved merge conflict

joomla · Dec 21, 2016 · 1a7be2d · 1a7be2d
1 parent 2c03e65
commit 1a7be2d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * @package     Joomla.Site
@@ -66,7 +67,7 @@
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 			<?php if ($params->get('show_urls_images_frontend')) : ?>
-			<?php echo JHtml::_("bootstrap.addTab", $this->tab_name, "images", JText::_("COM_CONTENT_IMAGES_AND_URLS")); ?>
+			<?php echo JHtml::_('bootstrap.addTab', $this->tab_name, 'images', JText::_('COM_CONTENT_IMAGES_AND_URLS')); ?>
 				<?php echo $this->form->renderField('image_intro', 'images'); ?>
 				<?php echo $this->form->renderField('image_intro_alt', 'images'); ?>
 				<?php echo $this->form->renderField('image_intro_caption', 'images'); ?>