From f1072d3dec0d8e8c734f4621a446c017fea34967 Mon Sep 17 00:00:00 2001
From: cduhn17 <87447403+cduhn17@users.noreply.github.com>
Date: Tue, 5 Mar 2024 08:15:09 -0600
Subject: [PATCH] Update CODEOWNERS username

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e4195476..0da3ce4b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,9 +3,9 @@
 # These owners will be the default owners for everything in the
 # repo. Unless a later match takes precedence, these owners will be
 # requested for review when someone opens a pull request.
-<<<<<<< Updated upstream
 
-* @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj @rapidray12 @schmelz1 @cdunn17 @aloftus23 @Matthew-Grayson @nickviola
+
+* @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj @rapidray12 @schmelz21 @cdunn17 @aloftus23 @Matthew-Grayson @nickviola
 
 # These folks own any files in the .github directory at the root of
 # the repository and any of its subdirectories.