From 664f31ec988180341f007b4479ea83a19e68d8e7 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 30 Mar 2020 09:51:45 +0100
Subject: [PATCH] Ensure state res results are unique

---
 roomserver/state/state.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roomserver/state/state.go b/roomserver/state/state.go
index b8e3e18a1..94873dbeb 100644
--- a/roomserver/state/state.go
+++ b/roomserver/state/state.go
@@ -672,7 +672,7 @@ func (v StateResolution) calculateStateAfterManyEvents(
 			return
 		}
 		algorithm = "full_state_with_conflicts"
-		state = resolved
+		state = resolved[:util.SortAndUnique(stateEntrySorter(resolved))]
 	} else {
 		algorithm = "full_state_no_conflicts"
 		// 6) There weren't any conflicts