1
0
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:
Sebastian
2017-11-19 18:31:14 +01:00
5 changed files with 9 additions and 4 deletions

View File

@@ -13,7 +13,7 @@ session_start();
* LOAD SETTINGS *
************************/
$settings = Typemill\Settings::loadSettings();
$settings = Typemill\settings::loadSettings();
/************************
* INITIATE SLIM *