Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 1 insertions, 2 deletions

diff --git a/synapse/util/rlimit.py b/synapse/util/rlimit.py

index f4a9abf83f..6c0f2bb0cf 100644
--- a/synapse/util/rlimit.py
+++ b/synapse/util/rlimit.py
@@ -13,9 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import resource
 import logging
-
+import resource
 
 logger = logging.getLogger("synapse.app.homeserver")