diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-30 15:16:38 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-30 15:16:38 +0000 |
commit | 1bd540ef7943c08e350ba24c407f152016fa6064 (patch) | |
tree | 47f2f0cbc07a943fbdd8d154b6d88ace246e4787 /synapse/storage/schema/delta/v12.sql | |
parent | Merge branch 'replication_split' of github.com:matrix-org/synapse into reject... (diff) | |
parent | Merge pull request #42 from matrix-org/replication_split (diff) | |
download | synapse-1bd540ef7943c08e350ba24c407f152016fa6064.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/schema/im.sql
Diffstat (limited to 'synapse/storage/schema/delta/v12.sql')
-rw-r--r-- | synapse/storage/schema/delta/v12.sql | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/storage/schema/delta/v12.sql b/synapse/storage/schema/delta/v12.sql index c7e396beb6..a6867cba62 100644 --- a/synapse/storage/schema/delta/v12.sql +++ b/synapse/storage/schema/delta/v12.sql @@ -17,7 +17,6 @@ CREATE TABLE IF NOT EXISTS rejections( event_id TEXT NOT NULL, reason TEXT NOT NULL, last_check TEXT NOT NULL, - root_rejected TEXT, CONSTRAINT ev_id UNIQUE (event_id) ON CONFLICT REPLACE ); |