From 09dbcf3283518e56f5ee019776a69bb473c1974d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sat, 10 May 2025 16:29:04 -0700
Subject: [PATCH] fix bad conflict resolution

---
 client/src/locales/gb.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json
index 222d68a7f..b2b173f9e 100644
--- a/client/src/locales/gb.json
+++ b/client/src/locales/gb.json
@@ -511,4 +511,5 @@
 		"profile": "Profile",
 		"password": "Password",
 		"team": "Team"
+	}
 }