Index: OWNERS |
diff --git a/OWNERS b/OWNERS |
index 1a390242f1d7132b347d6c5423940b6b231aff31..6ad0ceeca8c6383c4925ed39931b22047d5735e7 100644 |
--- a/OWNERS |
+++ b/OWNERS |
@@ -1,3 +1,7 @@ |
xyzzyz@chromium.org |
gcasto@chromium.org |
maniscalco@chromium.org |
+<<<<<<< HEAD |
xyzzyz
2016/10/21 20:14:38
Remove merge conflict marks.
|
+perumaal@chromium.org |
+======= |
+>>>>>>> 37667a0807047c1c7ca4e1ebc9ce5c5cc1faa7e8 |
Garrett Casto
2016/10/21 20:18:25
Need to fix this :P
|