From d0974bd38db3efd9b362bd7d601ca253c4f8278a Mon Sep 17 00:00:00 2001
From: David Adams <david.adams@forgerock.com>
Date: Fri, 12 Nov 2021 17:34:39 +0000
Subject: [PATCH 1/2] fix(dave): fixed spelling error

Somehow someone misspelled my name, so I'm fixing it
---
 team.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/team.txt b/team.txt
index 8e74c20..8dfd4e4 100644
--- a/team.txt
+++ b/team.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 1. Andee
 2. Baylla
 3. Davved
@@ -9,3 +10,16 @@
 9. Rodreego
 10. Sammual
 11. Stowyen
+=======
+Andee
+Baylla
+David
+Goorge
+Gysell
+Justyn
+Loois
+Rian
+Rodreego
+Sammual
+Stowyen
+>>>>>>> 2a3a602 (fix(dave): fixed spelling error)

From 5ea067340ed26b3b96d21795417714dc430f3107 Mon Sep 17 00:00:00 2001
From: David Adams <david.adams@forgerock.com>
Date: Fri, 12 Nov 2021 18:16:39 +0000
Subject: [PATCH 2/2] Fixed my name again!

---
 team.txt | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/team.txt b/team.txt
index 8dfd4e4..17a18c6 100644
--- a/team.txt
+++ b/team.txt
@@ -1,7 +1,6 @@
-<<<<<<< HEAD
 1. Andee
 2. Baylla
-3. Davved
+3. David
 4. Goorge
 5. Gysell
 6. Justyn
@@ -10,16 +9,3 @@
 9. Rodreego
 10. Sammual
 11. Stowyen
-=======
-Andee
-Baylla
-David
-Goorge
-Gysell
-Justyn
-Loois
-Rian
-Rodreego
-Sammual
-Stowyen
->>>>>>> 2a3a602 (fix(dave): fixed spelling error)