Merge branch 'conflict'

# Conflicts: # tigers.yaml
gch04719 · Jul 24, 2022 · 52325ee · 52325ee
2 parents 25d138e + fc9343f
commit 52325ee
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tigers.yaml b/tigers.yaml
@@ -10,4 +10,4 @@ members:
 - David
 - George
 - Tyler 
-- Kim
+- Kim