Merge remote-tracking branch 'origin/master'
# Conflicts: # admin/admin.php # classes/Battles/User.php # classes/Battles/UserStats.php # fbattle.php # functions.php
This commit is contained in:
@@ -6,9 +6,6 @@
|
||||
* Project name: Battles-Game
|
||||
*/
|
||||
|
||||
use Battles\Database\Db;
|
||||
use Battles\User;
|
||||
|
||||
include_once 'classes/Database/db.php';
|
||||
include_once 'classes/Database/Mysql.php';
|
||||
include_once 'classes/Database/Statement.php';
|
||||
|
||||
Reference in New Issue
Block a user