From 87ca989edb7590b9345d3df7344f6b3e7bb038b0 Mon Sep 17 00:00:00 2001
From: Aaron Jeyaraj <ajeyaraj@crusoeenergy.com>
Date: Fri, 4 Oct 2024 10:31:22 -0700
Subject: [PATCH] test2

---
 .gitlab/CODEOWNERS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 1def034..da621a0 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -1,5 +1,10 @@
 # default = everyone is codeowner
+<<<<<<< Updated upstream
 * @ajeyaraj1
+=======
+* @crusoeenergy/island
+.github/ @azhang1982133
+>>>>>>> Stashed changes
 
 .gitlab/CODEOWNERS @lanwall12 @nitper @bsherrycrusoe @ksosnowski3 @dpattishall