Commit 0216b3f0 authored by jlopez's avatar jlopez
Browse files

Merge conflit

parents 8d02a0e9 0ab7145d
......@@ -10,7 +10,8 @@ class Conf {
public static $DB_PP = '';
public static $KK = "";
// generate an admin password with: echo password|sha1sum|awk '{print $1}';
public static $KK = "to_replace_with_your_admin_pass";
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment