gistfile1.diff

diff --cc model/DB.php
index 985a420,5f215a6..0000000
--- a/model/DB.php
+++ b/model/DB.php
@@@ -233,13 -171,9 +233,19 @@@ class DB 
                self::$connection_attempted = true;
  
                $dbClass = $databaseConfig['type'];
++<<<<<<< HEAD
++||||||| merged common ancestors
++              $conn = new $dbClass($databaseConfig);
++=======
+               $conn = Injector::inst()->create($dbClass, $databaseConfig);
++>>>>>>> origin/3.1
  
 -              self::setConn($conn, $label);
 +              // Using Injector->get allows us to use registered configurations
 +              // which may or may not map to explicit objects
 +              $conn = Injector::inst()->get($dbClass);
 +              $conn->connect($databaseConfig);
 +
 +              self::set_conn($conn, $label);
  
                return $conn;
        }

$conn = Injector::inst()->create($dbClass);
$conn->connect($databaseConfig);

Result: https://gist.github.com/mateusz/dc48410719674bc258ad