Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

1 files changed, 0 insertions, 1 deletions

diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py

index 2d50060ffb..de1bcee0a7 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright 2016 OpenMarket Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");