diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:19:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:19:49 +0000 |
| commit | c515d377973560a6e9d96fa5ee53e1de7dc67347 (patch) | |
| tree | ec58161881f5d9180a41bb8610152cfe5ff0ddc5 /synapse/storage | |
| parent | Fix bug where we superfluously asked for current state. Change API of /query_... (diff) | |
| parent | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli... (diff) | |
| download | synapse-c515d377973560a6e9d96fa5ee53e1de7dc67347.tar.xz | |
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/schema/delta/v12.sql | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/storage/schema/delta/v12.sql b/synapse/storage/schema/delta/v12.sql index d83c3b049e..c7e396beb6 100644 --- a/synapse/storage/schema/delta/v12.sql +++ b/synapse/storage/schema/delta/v12.sql @@ -1,8 +1,4 @@ -<<<<<<< HEAD /* Copyright 2015 OpenMarket Ltd -======= -/* Copyright 2014 OpenMarket Ltd ->>>>>>> fc946f3b8da8c7f71a9c25bf542c04472147bc5b * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,4 +53,3 @@ CREATE TABLE IF NOT EXISTS push_rules ( ); CREATE INDEX IF NOT EXISTS push_rules_user_name on push_rules (user_name); - |