Removed Conflicts

2021-10-21 23:24:54 +05:30
parent 657c16720e
commit c95a2a1413
2 changed files with 29 additions and 29 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -16,6 +16,17 @@
        "content"
      ]
    },
+    {
+      "login": "ohbus",
+      "name": "Subhrodip Mohanta",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/13291222?v=4",
+      "profile": "http://subho.xyz",
+      "contributions": [
+        "code",
+        "review",
+        "maintenance"
+      ]
+    },
    {
      "login": "amit1307",
      "name": "amit1307",
@ -1125,17 +1136,6 @@
        "ideas"
      ]
    },
-    {
-      "login": "ohbus",
-      "name": "Subhrodip Mohanta",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/13291222?v=4",
-      "profile": "http://subho.xyz",
-      "contributions": [
-        "code",
-        "review",
-        "maintenance"
-      ]
-    },
    {
      "login": "nahteb",
      "name": "Bethan Palmer",