merging

open-sauced · May 27, 2024 · 58d1931 · 58d1931
1 parent 76250a0
commit 58d1931
Show file tree

Hide file tree

Showing 2 changed files with 258 additions and 1 deletion.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2155,6 +2155,7 @@
         "code",
         "data"
       ]
+<<<<<<< HEAD
     },
     {
       "login": "chydeepak7",
@@ -2164,6 +2165,8 @@
       "contributions": [
         "bug"
       ]
+=======
+>>>>>>> parent of b4477d7 (docs: add @chydeepak7 as a contributor)
     }
   ],
   "contributorsPerLine": 7,