diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-11 00:35:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 00:35:13 +0100 |
| commit | 23e2dfe9405baf8495c207c884153d6a9555f3e6 (patch) | |
| tree | f4f3d48b4d347f7a43489179fbdc1f118965ef38 /synapse/federation | |
| parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
| parent | transaction_id, destination twice (diff) | |
| download | synapse-23e2dfe9405baf8495c207c884153d6a9555f3e6.tar.xz | |
Merge pull request #3209 from damir-manapov/master
transaction_id, destination defined twice
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/units.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py index 3f645acc43..01c5b8fe17 100644 --- a/synapse/federation/units.py +++ b/synapse/federation/units.py @@ -74,8 +74,6 @@ class Transaction(JsonEncodedObject): "previous_ids", "pdus", "edus", - "transaction_id", - "destination", "pdu_failures", ] |