Resolve merge conflicts

open-sauced · Jan 9, 2025 · 0386a16 · 0386a16
2 parents b91fbaa + 113e05a
commit 0386a16
Show file tree

Hide file tree

Showing 2 changed files with 142 additions and 1 deletion.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -3274,6 +3274,136 @@
         "userTesting"
       ]
     },
+    {
+      "login": "sasori-morningstar",
+      "name": "Ilyes Medjedoub",
+      "avatar_url": "https://avatars.githubusercontent.com/u/116976342?v=4",
+      "profile": "https://sasori-morningstar.vercel.app/",
+      "contributions": [
+        "ideas",
+        "tutorial"
+      ]
+    },
+    {
+      "login": "ivngzmn",
+      "name": "Ivan Guzman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15111222?v=4",
+      "profile": "https://github.com/ivngzmn",
+      "contributions": [
+        "question",
+        "blog",
+        "bug",
+        "code",
+        "content",
+        "design",
+        "doc",
+        "ideas",
+        "maintenance",
+        "mentoring",
+        "review",
+        "translation"
+      ]
+    },
+    {
+      "login": "pyogi27",
+      "name": "Patel Yogi Chetanbhai",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74909570?v=4",
+      "profile": "https://github.com/pyogi27",
+      "contributions": [
+        "question"
+      ]
+    },
+    {
+      "login": "divin3circle",
+      "name": "Sylus Abel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/119014867?v=4",
+      "profile": "https://venusgaming.me/",
+      "contributions": [
+        "code",
+        "question",
+        "bug",
+        "design",
+        "maintenance",
+        "research",
+        "review",
+        "test",
+        "translation",
+        "tutorial"
+      ]
+    },
+    {
+      "login": "diegodemiranda",
+      "name": "Diego de Miranda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97299663?v=4",
+      "profile": "https://www.behance.net/diegodemirandadesign",
+      "contributions": [
+        "bug",
+        "code",
+        "data",
+        "design",
+        "doc",
+        "ideas",
+        "translation",
+        "userTesting"
+      ]
+    },
+    {
+      "login": "errantpianist",
+      "name": "errantpianist",
+      "avatar_url": "https://avatars.githubusercontent.com/u/104738718?v=4",
+      "profile": "https://github.com/errantpianist",
+      "contributions": [
+        "question",
+        "bug",
+        "code",
+        "content",
+        "data",
+        "doc",
+        "example",
+        "ideas",
+        "mentoring",
+        "research",
+        "review",
+        "test",
+        "tutorial",
+        "userTesting"
+      ]
+    },
+    {
+      "login": "ankit",
+      "name": "Ankit Ahuja",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61857?v=4",
+      "profile": "http://ankitahuja.com/about",
+      "contributions": [
+        "question",
+        "video"
+      ]
+    },
+    {
+      "login": "Ankit8848",
+      "name": "Ankit Kumar Jha",
+      "avatar_url": "https://avatars.githubusercontent.com/u/107815079?v=4",
+      "profile": "https://ankitjha.live/",
+      "contributions": [
+        "a11y",
+        "question"
+      ]
+    },
+    {
+      "login": "RayX81194",
+      "name": "ray",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111891431?v=4",
+      "profile": "https://github.com/RayX81194",
+      "contributions": [
+        "question",
+        "audio",
+        "code",
+        "design",
+        "ideas",
+        "talk",
+        "video"
+      ]
+    },
     {
       "login": "hakeemyusuff",
       "name": "HakeemYusuff",

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ All contributors are required to abide by our [Code of Conduct](https://github.c
 ## All Contributors
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-225-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-234-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## ✨ Contributors
@@ -335,6 +335,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/tkim602"><img src="https://avatars.githubusercontent.com/u/157748120?v=4?s=100" width="100px;" alt="TaeHo Kim"/><br /><sub><b>TaeHo Kim</b></sub></a><br /><a href="#question-tkim602" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Atkim602" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=tkim602" title="Tests">⚠️</a> <a href="#translation-tkim602" title="Translation">🌍</a> <a href="#userTesting-tkim602" title="User Testing">📓</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://sasori-morningstar.vercel.app/"><img src="https://avatars.githubusercontent.com/u/116976342?v=4?s=100" width="100px;" alt="Ilyes Medjedoub"/><br /><sub><b>Ilyes Medjedoub</b></sub></a><br /><a href="#ideas-sasori-morningstar" title="Ideas, Planning, & Feedback">🤔</a> <a href="#tutorial-sasori-morningstar" title="Tutorials">✅</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ivngzmn"><img src="https://avatars.githubusercontent.com/u/15111222?v=4?s=100" width="100px;" alt="Ivan Guzman"/><br /><sub><b>Ivan Guzman</b></sub></a><br /><a href="#question-ivngzmn" title="Answering Questions">💬</a> <a href="#blog-ivngzmn" title="Blogposts">📝</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Aivngzmn" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=ivngzmn" title="Code">💻</a> <a href="#content-ivngzmn" title="Content">🖋</a> <a href="#design-ivngzmn" title="Design">🎨</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=ivngzmn" title="Documentation">📖</a> <a href="#ideas-ivngzmn" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-ivngzmn" title="Maintenance">🚧</a> <a href="#mentoring-ivngzmn" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/TejasQ/opensauced-guestbook/pulls?q=is%3Apr+reviewed-by%3Aivngzmn" title="Reviewed Pull Requests">👀</a> <a href="#translation-ivngzmn" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pyogi27"><img src="https://avatars.githubusercontent.com/u/74909570?v=4?s=100" width="100px;" alt="Patel Yogi Chetanbhai"/><br /><sub><b>Patel Yogi Chetanbhai</b></sub></a><br /><a href="#question-pyogi27" title="Answering Questions">💬</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://venusgaming.me/"><img src="https://avatars.githubusercontent.com/u/119014867?v=4?s=100" width="100px;" alt="Sylus Abel"/><br /><sub><b>Sylus Abel</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=divin3circle" title="Code">💻</a> <a href="#question-divin3circle" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Adivin3circle" title="Bug reports">🐛</a> <a href="#design-divin3circle" title="Design">🎨</a> <a href="#maintenance-divin3circle" title="Maintenance">🚧</a> <a href="#research-divin3circle" title="Research">🔬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/pulls?q=is%3Apr+reviewed-by%3Adivin3circle" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=divin3circle" title="Tests">⚠️</a> <a href="#translation-divin3circle" title="Translation">🌍</a> <a href="#tutorial-divin3circle" title="Tutorials">✅</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.behance.net/diegodemirandadesign"><img src="https://avatars.githubusercontent.com/u/97299663?v=4?s=100" width="100px;" alt="Diego de Miranda"/><br /><sub><b>Diego de Miranda</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Adiegodemiranda" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=diegodemiranda" title="Code">💻</a> <a href="#data-diegodemiranda" title="Data">🔣</a> <a href="#design-diegodemiranda" title="Design">🎨</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=diegodemiranda" title="Documentation">📖</a> <a href="#ideas-diegodemiranda" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-diegodemiranda" title="Translation">🌍</a> <a href="#userTesting-diegodemiranda" title="User Testing">📓</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/errantpianist"><img src="https://avatars.githubusercontent.com/u/104738718?v=4?s=100" width="100px;" alt="errantpianist"/><br /><sub><b>errantpianist</b></sub></a><br /><a href="#question-errantpianist" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Aerrantpianist" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=errantpianist" title="Code">💻</a> <a href="#content-errantpianist" title="Content">🖋</a> <a href="#data-errantpianist" title="Data">🔣</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=errantpianist" title="Documentation">📖</a> <a href="#example-errantpianist" title="Examples">💡</a> <a href="#ideas-errantpianist" title="Ideas, Planning, & Feedback">🤔</a> <a href="#mentoring-errantpianist" title="Mentoring">🧑‍🏫</a> <a href="#research-errantpianist" title="Research">🔬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/pulls?q=is%3Apr+reviewed-by%3Aerrantpianist" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=errantpianist" title="Tests">⚠️</a> <a href="#tutorial-errantpianist" title="Tutorials">✅</a> <a href="#userTesting-errantpianist" title="User Testing">📓</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://ankitahuja.com/about"><img src="https://avatars.githubusercontent.com/u/61857?v=4?s=100" width="100px;" alt="Ankit Ahuja"/><br /><sub><b>Ankit Ahuja</b></sub></a><br /><a href="#question-ankit" title="Answering Questions">💬</a> <a href="#video-ankit" title="Videos">📹</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://ankitjha.live/"><img src="https://avatars.githubusercontent.com/u/107815079?v=4?s=100" width="100px;" alt="Ankit Kumar Jha"/><br /><sub><b>Ankit Kumar Jha</b></sub></a><br /><a href="#a11y-Ankit8848" title="Accessibility">️️️️♿️</a> <a href="#question-Ankit8848" title="Answering Questions">💬</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RayX81194"><img src="https://avatars.githubusercontent.com/u/111891431?v=4?s=100" width="100px;" alt="ray"/><br /><sub><b>ray</b></sub></a><br /><a href="#question-RayX81194" title="Answering Questions">💬</a> <a href="#audio-RayX81194" title="Audio">🔊</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=RayX81194" title="Code">💻</a> <a href="#design-RayX81194" title="Design">🎨</a> <a href="#ideas-RayX81194" title="Ideas, Planning, & Feedback">🤔</a> <a href="#talk-RayX81194" title="Talks">📢</a> <a href="#video-RayX81194" title="Videos">📹</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hakeemyusuff"><img src="https://avatars.githubusercontent.com/u/105215519?v=4?s=100" width="100px;" alt="HakeemYusuff"/><br /><sub><b>HakeemYusuff</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=hakeemyusuff" title="Code">💻</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=hakeemyusuff" title="Documentation">📖</a> <a href="#maintenance-hakeemyusuff" title="Maintenance">🚧</a></td>
     </tr>
   </tbody>