From bd5ec4eee3fd3d3bea8429edc80394081b70446f Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Mon, 22 Jan 2018 20:48:26 -0200
Subject: [PATCH] Adds the Wjohn as /icons folder codeowner

---
 .github/CODEOWNERS | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2df370e6ea..22e6bd1730 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -61,6 +61,16 @@
 
 # ShizCalev
 
+<<<<<<< HEAD
 /_maps/* @ShizCalev
 /icons/* @ShizCalev
 /sound/* @ShizCalev
+=======
+/_maps/ @ShizCalev
+/icons/ @ShizCalev
+/sound/ @ShizCalev
+
+# WJohnston
+
+/icons/ @WJohn
+>>>>>>> 0363132... Adds the art director as /icons folder codeowner (#34803)