remove Sam Roberts from all email lists

nodejs · Jul 2, 2020 · 87e261d · 87e261d
1 parent 8b6e089
commit 87e261d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/iojs.org/aliases.json b/iojs.org/aliases.json
@@ -22,8 +22,7 @@
       "[email protected]",
       "[email protected]",
       "[email protected]",
-      "[email protected]",
-      "[email protected]"
+      "[email protected]"
     ]
   },
   {
@@ -172,7 +171,10 @@
     "to": [
       "[email protected]",
       "[email protected]",
+<<<<<<< HEAD
       "[email protected]",
+=======
+>>>>>>> remove Sam Roberts from all email lists
       "[email protected]"
     ]
   },
@@ -181,7 +183,10 @@
     "to": [
       "[email protected]",
       "[email protected]",
+<<<<<<< HEAD
       "[email protected]",
+=======
+>>>>>>> remove Sam Roberts from all email lists
       "[email protected]"
     ]
   },
@@ -248,8 +253,7 @@
       "[email protected]",
       "[email protected]",
       "[email protected]",
-      "[email protected]",
-      "[email protected]"
+      "[email protected]"
     ]
   },
   {