resolve conflict

merged conflict
joomla · Aug 30, 2015 · 2af766e · 2af766e
1 parent 1af44a2
commit 2af766e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/cms/installer/adapter/file.php b/libraries/cms/installer/adapter/file.php
@@ -484,7 +484,7 @@ public function uninstall($id)
 	protected function extensionExistsInSystem($extension = null)
 	{
 		// Get a database connector object
-		$db = $this->parent->getDBO();
+		$db = $this->parent->getDbo();
 
 		$query = $db->getQuery(true)
 			->select($db->quoteName('extension_id'))