Update CODEOWNERS

2018-01-23 08:17:53 -06:00
parent bd5ec4eee3
commit abf98762c8
1 changed files with 0 additions and 7 deletions
@@ -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)