Fix merge conflict

joomla · Apr 8, 2019 · 9540bd0 · 9540bd0
1 parent cd959ef
commit 9540bd0
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
@@ -22,6 +22,7 @@
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Language\LanguageHelper;
 
 /**
  * Prototype admin model.
@@ -1536,8 +1537,6 @@ public function initBatch()
 				?: $this->contentType->getTypeByAlias($this->typeAlias);
 		}
 	}
-<<<<<<< HEAD
-=======
 
 	/**
 	 * Method to load an item in com_associations.
@@ -1633,5 +1632,4 @@ public function editAssociations($data)
 
 		return true;
 	}
->>>>>>> f7307806c7b3d4331b308119bff6c4b25411f295
 }