From 280863b3d3be2c0bc7a06b7e5cf3d0840b30f250 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@jki.re>
Date: Tue, 10 Oct 2017 13:55:07 +0100
Subject: [PATCH] Still trying to fix that merge...

---
 .../dendrite/clientapi/auth/storage/accounts/storage.go         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/storage.go b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/storage.go
index b49e83705..4bc570a25 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/storage.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/storage.go
@@ -348,4 +348,4 @@ func (d *Database) CheckAccountAvailability(ctx context.Context, localpart strin
 		return true, nil
 	}
 	return false, err
-
+}