Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@adiati98
adiati98 committed Jan 8, 2025
2 parents 670c030 + 394c1ca commit 72b6fb4
Show file tree
Hide file tree
Showing 2 changed files with 200 additions and 4 deletions.
183 changes: 181 additions & 2 deletions .all-contributorsrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3069,9 +3069,9 @@
},
{
"login": "nhim-uit",
"name": "Hoang Nhi, Mai",
"name": "H. Nhi (Alex)",
"avatar_url": "https://avatars.githubusercontent.com/u/165756103?v=4",
"profile": "https://oss.fyi/nhim-uit",
"profile": "https://app.opensauced.pizza/u/nhim-uit",
"contributions": [
"question",
"bug",
Expand Down Expand Up @@ -3105,6 +3105,185 @@
"tutorial"
]
},
{
"login": "livlaurel",
"name": "Olivia Laurel",
"avatar_url": "https://avatars.githubusercontent.com/u/123695131?v=4",
"profile": "https://github.com/livlaurel",
"contributions": [
"question",
"code",
"design",
"userTesting"
]
},
{
"login": "sank8-2",
"name": "Sanketh Kumar",
"avatar_url": "https://avatars.githubusercontent.com/u/61641814?v=4",
"profile": "https://github.com/sank8-2",
"contributions": [
"question",
"code",
"doc"
]
},
{
"login": "dehanli",
"name": "Dehan",
"avatar_url": "https://avatars.githubusercontent.com/u/98049224?v=4",
"profile": "https://github.com/dehanli",
"contributions": [
"a11y"
]
},
{
"login": "hurshore",
"name": "Jahtofunmi Osho",
"avatar_url": "https://avatars.githubusercontent.com/u/56561245?v=4",
"profile": "https://tofunmiosho.netlify.app/",
"contributions": [
"bug",
"code",
"doc",
"example"
]
},
{
"login": "Shin1ma",
"name": "Ruben amadei",
"avatar_url": "https://avatars.githubusercontent.com/u/106842119?v=4",
"profile": "https://github.com/Shin1ma",
"contributions": [
"question",
"doc",
"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",
"avatar_url": "https://avatars.githubusercontent.com/u/78403465?v=4",
"profile": "https://github.com/stephmukami",
"contributions": [
"code",
"data"
]
},
{
"login": "SusanGithaigaN",
"name": "Susan Githaiga",
"avatar_url": "https://avatars.githubusercontent.com/u/117893498?v=4",
"profile": "https://github.com/SusanGithaigaN",
"contributions": [
"question",
"blog",
"bug",
"code",
"doc"
]
},
{
"login": "tkim602",
"name": "TaeHo Kim",
"avatar_url": "https://avatars.githubusercontent.com/u/157748120?v=4",
"profile": "https://github.com/tkim602",
"contributions": [
"question",
"bug",
"test",
"translation",
"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",
Expand Down
21 changes: 19 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-213-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-226-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

## ✨ Contributors
Expand Down Expand Up @@ -317,8 +317,25 @@ 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/liaxoo"><img src="https://avatars.githubusercontent.com/u/57733867?v=4?s=100" width="100px;" alt="Liaxo"/><br /><sub><b>Liaxo</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=liaxoo" title="Code">💻</a> <a href="#design-liaxoo" title="Design">🎨</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=liaxoo" title="Documentation">📖</a> <a href="#infra-liaxoo" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#video-liaxoo" title="Videos">📹</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://oss.fyi/nhim-uit"><img src="https://avatars.githubusercontent.com/u/165756103?v=4?s=100" width="100px;" alt="Hoang Nhi, Mai"/><br /><sub><b>Hoang Nhi, Mai</b></sub></a><br /><a href="#question-nhim-uit" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Anhim-uit" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=nhim-uit" title="Code">💻</a> <a href="#design-nhim-uit" title="Design">🎨</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=nhim-uit" title="Documentation">📖</a> <a href="#example-nhim-uit" title="Examples">💡</a> <a href="#ideas-nhim-uit" title="Ideas, Planning, & Feedback">🤔</a> <a href="#projectManagement-nhim-uit" title="Project Management">📆</a> <a href="#talk-nhim-uit" title="Talks">📢</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=nhim-uit" title="Tests">⚠️</a> <a href="#tool-nhim-uit" title="Tools">🔧</a> <a href="#translation-nhim-uit" title="Translation">🌍</a> <a href="#tutorial-nhim-uit" title="Tutorials">✅</a> <a href="#userTesting-nhim-uit" title="User Testing">📓</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://app.opensauced.pizza/u/nhim-uit"><img src="https://avatars.githubusercontent.com/u/165756103?v=4?s=100" width="100px;" alt="H. Nhi (Alex)"/><br /><sub><b>H. Nhi (Alex)</b></sub></a><br /><a href="#question-nhim-uit" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Anhim-uit" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=nhim-uit" title="Code">💻</a> <a href="#design-nhim-uit" title="Design">🎨</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=nhim-uit" title="Documentation">📖</a> <a href="#example-nhim-uit" title="Examples">💡</a> <a href="#ideas-nhim-uit" title="Ideas, Planning, & Feedback">🤔</a> <a href="#projectManagement-nhim-uit" title="Project Management">📆</a> <a href="#talk-nhim-uit" title="Talks">📢</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=nhim-uit" title="Tests">⚠️</a> <a href="#tool-nhim-uit" title="Tools">🔧</a> <a href="#translation-nhim-uit" title="Translation">🌍</a> <a href="#tutorial-nhim-uit" title="Tutorials">✅</a> <a href="#userTesting-nhim-uit" title="User Testing">📓</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mrcentimetre"><img src="https://avatars.githubusercontent.com/u/74942413?v=4?s=100" width="100px;" alt="Udana Nimsara"/><br /><sub><b>Udana Nimsara</b></sub></a><br /><a href="#question-mrcentimetre" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=mrcentimetre" title="Code">💻</a> <a href="#eventOrganizing-mrcentimetre" title="Event Organizing">📋</a> <a href="#example-mrcentimetre" title="Examples">💡</a> <a href="https://github.com/TejasQ/opensauced-guestbook/pulls?q=is%3Apr+reviewed-by%3Amrcentimetre" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Amrcentimetre" title="Bug reports">🐛</a> <a href="#translation-mrcentimetre" title="Translation">🌍</a> <a href="#tutorial-mrcentimetre" title="Tutorials">✅</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/livlaurel"><img src="https://avatars.githubusercontent.com/u/123695131?v=4?s=100" width="100px;" alt="Olivia Laurel"/><br /><sub><b>Olivia Laurel</b></sub></a><br /><a href="#question-livlaurel" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=livlaurel" title="Code">💻</a> <a href="#design-livlaurel" title="Design">🎨</a> <a href="#userTesting-livlaurel" title="User Testing">📓</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sank8-2"><img src="https://avatars.githubusercontent.com/u/61641814?v=4?s=100" width="100px;" alt="Sanketh Kumar"/><br /><sub><b>Sanketh Kumar</b></sub></a><br /><a href="#question-sank8-2" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=sank8-2" title="Code">💻</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=sank8-2" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/dehanli"><img src="https://avatars.githubusercontent.com/u/98049224?v=4?s=100" width="100px;" alt="Dehan"/><br /><sub><b>Dehan</b></sub></a><br /><a href="#a11y-dehanli" title="Accessibility">️️️️♿️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://tofunmiosho.netlify.app/"><img src="https://avatars.githubusercontent.com/u/56561245?v=4?s=100" width="100px;" alt="Jahtofunmi Osho"/><br /><sub><b>Jahtofunmi Osho</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Ahurshore" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=hurshore" title="Code">💻</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=hurshore" title="Documentation">📖</a> <a href="#example-hurshore" title="Examples">💡</a></td>
<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>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SusanGithaigaN"><img src="https://avatars.githubusercontent.com/u/117893498?v=4?s=100" width="100px;" alt="Susan Githaiga"/><br /><sub><b>Susan Githaiga</b></sub></a><br /><a href="#question-SusanGithaigaN" title="Answering Questions">💬</a> <a href="#blog-SusanGithaigaN" title="Blogposts">📝</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3ASusanGithaigaN" title="Bug reports">🐛</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=SusanGithaigaN" title="Code">💻</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=SusanGithaigaN" title="Documentation">📖</a></td>
<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>
</tr>
</tbody>
Expand Down

0 comments on commit 72b6fb4

Please sign in to comment.