Merge conflict resolve ***NO_CI***

jaddie · May 28, 2019 · fbac83a · fbac83a
2 parents c65655e + e7700b9
commit fbac83a
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -13,6 +13,36 @@
       "contributions": [
         "test"
       ]
+    },
+    {
+      "login": "rdlaitila",
+      "name": "Regan Laitila",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1124388?v=4",
+      "profile": "https://github.com/rdlaitila",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "IcanBENCHurCAT",
+      "name": "IcanBENCHurCAT",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/4152550?v=4",
+      "profile": "https://github.com/IcanBENCHurCAT",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "stoiveyp",
+      "name": "Steven Pears",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/147125?v=4",
+      "profile": "http://www.imacode.ninja",
+      "contributions": [
+        "code",
+        "doc",
+        "tutorial",
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,