Conflict!

joomla · Oct 13, 2014 · 0c45da1 · 0c45da1
1 parent a44fce8
commit 0c45da1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php
@@ -65,11 +65,7 @@ public function display($cachable = false, $urlparams = false)
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Purge an array of cache groups.
-=======
 	 * Method to delete a list of cache groups.
->>>>>>> [Code Style] administrator/components/com_cache
 	 *
 	 * @return  void
 	 */