Address merge conflict

ml5js · Mar 23, 2021 · 4b0c343 · 4b0c343
2 parents bb90f06 + b1c26a4
commit 4b0c343
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1191,6 +1191,36 @@
         "code"
       ]
     },
+    {
+      "login": "netanoir",
+      "name": "neta",
+      "avatar_url": "https://avatars.githubusercontent.com/u/38016578?v=4",
+      "profile": "http://netabomani.com",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "koji",
+      "name": "Koji",
+      "avatar_url": "https://avatars.githubusercontent.com/u/474225?v=4",
+      "profile": "https://kojikoji.ga",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "josephrocca",
+      "name": "josephrocca",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1167575?v=4",
+      "profile": "https://github.com/josephrocca",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
     {
       "login": "lmccart",
       "name": "Lauren Lee McCarthy",

diff --git a/README.md b/README.md
@@ -248,6 +248,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://tlsaeger.de"><img src="https://avatars.githubusercontent.com/u/33449313?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom-Lucas Säger</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=tlsaeger" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/altruios"><img src="https://avatars.githubusercontent.com/u/49083558?v=4?s=100" width="100px;" alt=""/><br /><sub><b>altruios</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=altruios" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/mennosc"><img src="https://avatars.githubusercontent.com/u/47506398?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mennosc</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=mennosc" title="Code">💻</a></td>
+    <td align="center"><a href="http://netabomani.com"><img src="https://avatars.githubusercontent.com/u/38016578?v=4?s=100" width="100px;" alt=""/><br /><sub><b>neta</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=netanoir" title="Code">💻</a> <a href="https://github.com/ml5js/ml5-library/commits?author=netanoir" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://kojikoji.ga"><img src="https://avatars.githubusercontent.com/u/474225?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Koji</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=koji" title="Code">💻</a> <a href="https://github.com/ml5js/ml5-library/commits?author=koji" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/josephrocca"><img src="https://avatars.githubusercontent.com/u/1167575?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josephrocca</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=josephrocca" title="Code">💻</a> <a href="https://github.com/ml5js/ml5-library/commits?author=josephrocca" title="Documentation">📖</a></td>
     <td align="center"><a href="http://p5js.org"><img src="https://avatars.githubusercontent.com/u/191056?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lauren Lee McCarthy</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=lmccart" title="Code">💻</a> <a href="https://github.com/ml5js/ml5-library/commits?author=lmccart" title="Documentation">📖</a></td>
   </tr>
 </table>