summary refs log tree commit diff
path: root/synapse/storage/schema/delta/v12.sql
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 15:16:38 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 15:16:38 +0000
commit1bd540ef7943c08e350ba24c407f152016fa6064 (patch)
tree47f2f0cbc07a943fbdd8d154b6d88ace246e4787 /synapse/storage/schema/delta/v12.sql
parentMerge branch 'replication_split' of github.com:matrix-org/synapse into reject... (diff)
parentMerge pull request #42 from matrix-org/replication_split (diff)
downloadsynapse-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.sql1
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
 );