From 5444749edf539345945ef0243771e49371960721 Mon Sep 17 00:00:00 2001
From: Sam Hain <samuel.hain@forgerock.com>
Date: Fri, 12 Nov 2021 12:29:35 -0500
Subject: [PATCH] Fixing a spelling error in my name.

---
 team.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/team.txt b/team.txt
index 8e74c20..c463a65 100644
--- a/team.txt
+++ b/team.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 1. Andee
 2. Baylla
 3. Davved
@@ -7,5 +8,5 @@
 7. Loois
 8. Rian
 9. Rodreego
-10. Sammual
+10. Samuel
 11. Stowyen