fix: resolve merge conflicts

open-sauced · Dec 18, 2024 · 9ae6ab4 · 9ae6ab4
2 parents 5d35f36 + 3f8014f
commit 9ae6ab4
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 1 deletion.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -3160,6 +3160,84 @@
         "translation"
       ]
     },
+    {
+      "login": "aspects19",
+      "name": "Jeffarson Amenya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/133534815?v=4",
+      "profile": "https://github.com/aspects19",
+      "contributions": [
+        "question",
+        "code",
+        "doc",
+        "review",
+        "blog",
+        "bug",
+        "business",
+        "design",
+        "ideas",
+        "maintenance",
+        "talk",
+        "translation",
+        "tutorial",
+        "video"
+      ]
+    },
+    {
+      "login": "andymartinez1",
+      "name": "Andrew Martinez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49960406?v=4",
+      "profile": "https://github.com/andymartinez1",
+      "contributions": [
+        "question",
+        "code",
+        "data",
+        "projectManagement",
+        "promotion",
+        "research",
+        "talk",
+        "test",
+        "tool",
+        "userTesting"
+      ]
+    },
+    {
+      "login": "luciano665",
+      "name": "Luciano M.",
+      "avatar_url": "https://avatars.githubusercontent.com/u/132591575?v=4",
+      "profile": "https://lucianoportofliowebiste.com/",
+      "contributions": [
+        "question",
+        "bug",
+        "code",
+        "data",
+        "doc",
+        "example",
+        "ideas",
+        "mentoring",
+        "plugin",
+        "projectManagement",
+        "research",
+        "review",
+        "security",
+        "talk",
+        "test",
+        "tool",
+        "tutorial"
+      ]
+    },
+    {
+      "login": "adaniel105",
+      "name": "adaniel105",
+      "avatar_url": "https://avatars.githubusercontent.com/u/91155263?v=4",
+      "profile": "https://github.com/adaniel105",
+      "contributions": [
+        "code",
+        "doc",
+        "infra",
+        "plugin",
+        "research"
+      ]
+    },
     {
       "login": "stephmukami",
       "name": "Mukami",

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-218-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-222-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## ✨ Contributors
@@ -326,6 +326,10 @@ 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/Shin1ma"><img src="https://avatars.githubusercontent.com/u/106842119?v=4?s=100" width="100px;" alt="Ruben amadei"/><br /><sub><b>Ruben amadei</b></sub></a><br /><a href="#question-Shin1ma" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=Shin1ma" title="Documentation">📖</a> <a href="#translation-Shin1ma" title="Translation">🌍</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/aspects19"><img src="https://avatars.githubusercontent.com/u/133534815?v=4?s=100" width="100px;" alt="Jeffarson Amenya"/><br /><sub><b>Jeffarson Amenya</b></sub></a><br /><a href="#question-aspects19" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=aspects19" title="Code">💻</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=aspects19" title="Documentation">📖</a> <a href="https://github.com/TejasQ/opensauced-guestbook/pulls?q=is%3Apr+reviewed-by%3Aaspects19" title="Reviewed Pull Requests">👀</a> <a href="#blog-aspects19" title="Blogposts">📝</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Aaspects19" title="Bug reports">🐛</a> <a href="#business-aspects19" title="Business development">💼</a> <a href="#design-aspects19" title="Design">🎨</a> <a href="#ideas-aspects19" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-aspects19" title="Maintenance">🚧</a> <a href="#talk-aspects19" title="Talks">📢</a> <a href="#translation-aspects19" title="Translation">🌍</a> <a href="#tutorial-aspects19" title="Tutorials">✅</a> <a href="#video-aspects19" title="Videos">📹</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andymartinez1"><img src="https://avatars.githubusercontent.com/u/49960406?v=4?s=100" width="100px;" alt="Andrew Martinez"/><br /><sub><b>Andrew Martinez</b></sub></a><br /><a href="#question-andymartinez1" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=andymartinez1" title="Code">💻</a> <a href="#data-andymartinez1" title="Data">🔣</a> <a href="#projectManagement-andymartinez1" title="Project Management">📆</a> <a href="#promotion-andymartinez1" title="Promotion">📣</a> <a href="#research-andymartinez1" title="Research">🔬</a> <a href="#talk-andymartinez1" title="Talks">📢</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=andymartinez1" title="Tests">⚠️</a> <a href="#tool-andymartinez1" title="Tools">🔧</a> <a href="#userTesting-andymartinez1" title="User Testing">📓</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://lucianoportofliowebiste.com/"><img src="https://avatars.githubusercontent.com/u/132591575?v=4?s=100" width="100px;" alt="Luciano M."/><br /><sub><b>Luciano M.</b></sub></a><br /><a href="#question-luciano665" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Aluciano665" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=luciano665" title="Code">💻</a> <a href="#data-luciano665" title="Data">🔣</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=luciano665" title="Documentation">📖</a> <a href="#example-luciano665" title="Examples">💡</a> <a href="#ideas-luciano665" title="Ideas, Planning, & Feedback">🤔</a> <a href="#mentoring-luciano665" title="Mentoring">🧑‍🏫</a> <a href="#plugin-luciano665" title="Plugin/utility libraries">🔌</a> <a href="#projectManagement-luciano665" title="Project Management">📆</a> <a href="#research-luciano665" title="Research">🔬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/pulls?q=is%3Apr+reviewed-by%3Aluciano665" title="Reviewed Pull Requests">👀</a> <a href="#security-luciano665" title="Security">🛡️</a> <a href="#talk-luciano665" title="Talks">📢</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=luciano665" title="Tests">⚠️</a> <a href="#tool-luciano665" title="Tools">🔧</a> <a href="#tutorial-luciano665" title="Tutorials">✅</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/adaniel105"><img src="https://avatars.githubusercontent.com/u/91155263?v=4?s=100" width="100px;" alt="adaniel105"/><br /><sub><b>adaniel105</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=adaniel105" title="Code">💻</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=adaniel105" title="Documentation">📖</a> <a href="#infra-adaniel105" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#plugin-adaniel105" title="Plugin/utility libraries">🔌</a> <a href="#research-adaniel105" title="Research">🔬</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/stephmukami"><img src="https://avatars.githubusercontent.com/u/78403465?v=4?s=100" width="100px;" alt="Mukami"/><br /><sub><b>Mukami</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=stephmukami" title="Code">💻</a> <a href="#data-stephmukami" title="Data">🔣</a></td>
     </tr>
   </tbody>