Add OWNERS and OWNERS_ALIASES templates (aws-controllers-k8s#26)

RedbackThomson · ryansteakley · commit a3c4c982ab70 · 2021-05-18T10:59:17.000-07:00
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -9,7 +9,11 @@ aliases:
     - RedbackThomson
     - vijtrip2
   # TODO: Add your team members to your team controller alias
+<<<<<<< HEAD
   service-team:
     - akartsky
     - mbaijal
-    - surajkota
+    - surajkota
+=======
+  service-team: []
+>>>>>>> 93f2e33 (Add OWNERS and OWNERS_ALIASES templates (#26))
