Merge remote-tracking branch 'upstream/main' into gohaun_manley

byuccl · Oct 10, 2024 · 6c28465 · 6c28465
2 parents 3d87509 + 7b149d9
commit 6c28465
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1 @@
+* @jgoeders @wirthlin
diff --git a/_data/students.yaml b/_data/students.yaml
@@ -88,6 +88,19 @@ undergrad_students:
     last_name: Walker
     image: Preston_Walker.jpg
 
+<<<<<<< HEAD
     - first_name: Gohaun
     last_name: Manley
-    image: gohaun_manley.jpg
+    image: gohaun_manley.jpg
+=======
+  - first_name: Ayden
+    last_name: Bales
+    image: ayden_bales.jpg
+
+  - first_name: Connor
+    last_name: Young
+    image: connor_young.jpg
+
+
+
+>>>>>>> upstream/main
diff --git a/images/students/ayden_bales.jpg b/images/students/ayden_bales.jpg
diff --git a/images/students/connor_young.jpg b/images/students/connor_young.jpg