From 25e933f63f3f58205af99a8f5d5c3fc4badf9e76 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 28 Jan 2018 15:17:16 -0600 Subject: [PATCH] Update CODEOWNERS --- .github/CODEOWNERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b1ad2b595d..fd3d755f2c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -36,12 +36,7 @@ # duncathan /code/__DEFINES/atmospherics.dm @duncathan -<<<<<<< HEAD -/code/controllers/subsystem/air.dm @duncathan -/code/modules/atmospherics/* @duncathan -======= /code/modules/atmospherics/ @duncathan ->>>>>>> 8ed12ef... Merge pull request #35050 from ShizCalev/codeowners-fix # Jordie0608