Fix all-contributors config

dagnir · dagnir · commit b8599c109470 · 2026-01-23T10:27:09.000-08:00
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1102,7 +1102,6 @@
       "contributions": [
         "doc"
       ]
->>>>>>> origin/master
     }
   ],
   "contributorsPerLine": 7,
