merge conflicts

joomla · Jun 14, 2017 · 2360b16 · 2360b16
2 parents 05afb01 + bc144b7
commit 2360b16
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php
@@ -31,11 +31,7 @@
 $view     = $input->get('view', '');
 $layout   = $input->get('layout', '');
 $task     = $input->get('task', '');
-<<<<<<< HEAD
 $itemid   = $input->get('Itemid', 0, 'int');
-=======
-$itemid   = $input->get('Itemid', '', 'int');
->>>>>>> 67900290b0347553eb2513b54e677ca351174957
 $sitename = $app->get('sitename');
 
 $cpanel = ($option === 'com_cpanel');