From abf98762c856940d0a100bcf07df563e4940d387 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 23 Jan 2018 08:17:53 -0600 Subject: [PATCH] Update CODEOWNERS --- .github/CODEOWNERS | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 22e6bd1730..bd7f16f99d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -60,12 +60,6 @@ /code/modules/shuttle/* @ninjanomnom # ShizCalev - -<<<<<<< HEAD -/_maps/* @ShizCalev -/icons/* @ShizCalev -/sound/* @ShizCalev -======= /_maps/ @ShizCalev /icons/ @ShizCalev /sound/ @ShizCalev @@ -73,4 +67,3 @@ # WJohnston /icons/ @WJohn ->>>>>>> 0363132... Adds the art director as /icons folder codeowner (#34803)