mirror of
https://github.com/typemill/typemill.git
synced 2025-08-06 06:07:31 +02:00
resolved merge conflicts
This commit is contained in:
@@ -13,7 +13,7 @@ session_start();
|
||||
* LOAD SETTINGS *
|
||||
************************/
|
||||
|
||||
$settings = Typemill\Settings::loadSettings();
|
||||
$settings = Typemill\settings::loadSettings();
|
||||
|
||||
/************************
|
||||
* INITIATE SLIM *
|
||||
|
Reference in New Issue
Block a user