From f83dadba58a7b7027fde2de0f09eba819dc534f4 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Wed, 13 Sep 2017 12:56:24 +0100
Subject: [PATCH] Don't redeclare err

---
 .../matrix-org/dendrite/federationapi/writers/threepid.go       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go b/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
index ff347fcfe..22c61d911 100644
--- a/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
+++ b/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
@@ -196,7 +196,7 @@ func createInviteFrom3PIDInvite(
 		},
 	}
 
-	if err := builder.SetContent(content); err != nil {
+	if err = builder.SetContent(content); err != nil {
 		return nil, err
 	}