summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-03 10:50:30 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-03 10:50:30 +0100
commitaff4c2c652eccd514b809835357032853c2fb196 (patch)
tree0d058e4c39682dad15634ffcddbdabc82bf2ae8d
parentMerge branch 'develop' into markjh/synchrotron (diff)
downloadsynapse-markjh/synchrotron.tar.xz
-rw-r--r--synapse/storage/_base.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index aae3a24b77..32c6677d47 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -154,7 +154,6 @@ class SQLBaseStore(object):
         self.hs = hs
         self._clock = hs.get_clock()
         self._db_pool = hs.get_db_pool()
-        self._clock = hs.get_clock()
 
         self._previous_txn_total_time = 0
         self._current_txn_total_time = 0