Fix unnoticed merge conflict

synapse/federation/transaction_queue.py

@@ -14,13 +14,7 @@
 # limitations under the License.
 import datetime
 import logging
-<<<<<<< HEAD
-=======
-import random
-import json
-import opentracing
 import string
->>>>>>> 46aae2456... Reduce size of fed transaction IDs
 
 from six import itervalues
 
@@ -430,15 +424,6 @@ class TransactionQueue(object):
 
             pending_pdus = []
             while True:
-<<<<<<< HEAD
-=======
-                txn_id = _encode_id(self._next_txn_id)
-                self._next_txn_id += 1
-
-                for s in pdu_spans.values():
-                    s.set_tag("txn-id", txn_id)
-
->>>>>>> 46aae2456... Reduce size of fed transaction IDs
                 device_message_edus, device_stream_id, dev_list_id = (
                     yield self._get_new_device_messages(destination)
                 )