diff --git a/SQL/database_changelog.txt.rej b/SQL/database_changelog.txt.rej deleted file mode 100644 index f65c192173..0000000000 --- a/SQL/database_changelog.txt.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/SQL/database_changelog.txt b/SQL/database_changelog.txt (rejected hunks) -@@ -5,7 +5,7 @@ Also, added flags column to the player table. - - CREATE TABLE `role_time` ( `ckey` VARCHAR(32) NOT NULL , `job` VARCHAR(128) NOT NULL , `minutes` INT UNSIGNED NOT NULL, PRIMARY KEY (`ckey`, `job`) ) ENGINE = InnoDB; - --ALTER TABLE `player` ADD `flags` INT NOT NULL AFTER `accountjoindate`; -+ALTER TABLE `player` ADD `flags` INT NOT NULL default '0' AFTER `accountjoindate`; - - UPDATE `schema_revision` SET minor = 1; -