From 306361b31bc0fb229de8db29209b9da38374d6f2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 12 Oct 2018 11:48:56 +0100
Subject: [PATCH] Misc PR feedback bits

---
 synapse/storage/e2e_room_keys.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 4d439bb16..f25ded229 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import simplejson as json
+import json
 
 from twisted.internet import defer
 
@@ -76,7 +76,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
             session_id(str): the session whose room_key we're setting
             room_key(dict): the room_key being set
         Raises:
-            StoreError if stuff goes wrong, probably
+            StoreError
         """
 
         yield self._simple_upsert(