Fixes new merge conflict from patreon PR

This commit is contained in:
Kyep
2016-12-02 22:53:08 -08:00
26 changed files with 6570 additions and 772 deletions
+19
View File
@@ -140,6 +140,25 @@ CREATE TABLE `death` (
) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `donators`
--
DROP TABLE IF EXISTS `donators`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `donators` (
`patreon_name` varchar(32) NOT NULL,
`tier` int(2),
`ckey` varchar(32) COMMENT 'Manual Field',
`start_date` datetime,
`end_date` datetime,
`active` boolean,
PRIMARY KEY (`patreon_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `admin`
--