Commit 8d02a0e9 authored by jlopez's avatar jlopez
Browse files

Merge conflit

parent 346f25f5
......@@ -10,6 +10,7 @@ class Conf {
public static $DB_PP = '';
public static $KK = "";
}
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