Merge branch 'develop' into rav/enforce_report_api

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py

index 8e684d91b5..bcd9bb5946 100644
--- a/synapse/events/snapshot.py
+++ b/synapse/events/snapshot.py
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from twisted.internet import defer
-
 from frozendict import frozendict
 
+from twisted.internet import defer
+
 
 class EventContext(object):
     """