diff options
| author |   William Heimbigner <william.heimbigner@gmail.com> | 2015-12-25 00:04:32 +0400 |
|---|---|---|
| committer | William Heimbigner <william.heimbigner@gmail.com> | 2015-12-25 00:04:32 +0400 |
| commit | defa3724e7b47ad860fa90d191cdde9be52b7b45 (patch) | |
| tree | 1fa5af1f8ad910557b500ad140ba57e8e964fabb | |
| parent | 82cb57987bcf020f1a54dfe3b6f95790151d76c6 (diff) | |
| parent | acae13769d15a4c535ecde6a3f8f2df9bd85dca8 (diff) | |
Merge branch 'master' of ssh://gitlab.devlabs.linuxassist.net:608/asm/antispammeta
Fixing schema file? I hope I'm not badly breaking git here
Conflicts:
DATABASE.SCHEMA
| -rw-r--r-- | DATABASE.SCHEMA | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/DATABASE.SCHEMA b/DATABASE.SCHEMA index 8a901f9..806ffdf 100644 --- a/DATABASE.SCHEMA +++ b/DATABASE.SCHEMA @@ -172,4 +172,3 @@ CREATE TABLE `topic` ( `content1` varchar(1000) NOT NULL, KEY `index` (`index`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; - |