Skip to content

Commit b1fe1d7

Browse files
committed
Resolve merge conflicts
2 parents 1d5b047 + b7f022f commit b1fe1d7

File tree

8 files changed

+412
-322
lines changed

8 files changed

+412
-322
lines changed

β€Ž.all-contributorsrcβ€Ž

Lines changed: 89 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"projectName": "opensauced-guestbook",
3-
"projectOwner": "TejasQ",
2+
"projectName": "guestbook",
3+
"projectOwner": "OpenSource-Community",
44
"repoType": "github",
55
"repoHost": "https://github.com",
66
"files": [
@@ -4398,6 +4398,93 @@
43984398
"question",
43994399
"example"
44004400
]
4401+
},
4402+
{
4403+
"login": "blobmister",
4404+
"name": "Krish Gupta",
4405+
"avatar_url": "https://avatars.githubusercontent.com/u/179193922?v=4",
4406+
"profile": "https://github.com/blobmister",
4407+
"contributions": [
4408+
"code",
4409+
"userTesting"
4410+
]
4411+
},
4412+
{
4413+
"login": "akrsh47",
4414+
"name": "Akarsh Balachandran",
4415+
"avatar_url": "https://avatars.githubusercontent.com/u/173702791?v=4",
4416+
"profile": "https://github.com/akrsh47",
4417+
"contributions": [
4418+
"doc"
4419+
]
4420+
},
4421+
{
4422+
"login": "Nabinbista12",
4423+
"name": "Nabin Bista",
4424+
"avatar_url": "https://avatars.githubusercontent.com/u/109153966?v=4",
4425+
"profile": "https://github.com/Nabinbista12",
4426+
"contributions": [
4427+
"question"
4428+
]
4429+
},
4430+
{
4431+
"login": "PandPirate",
4432+
"name": "PandPirate",
4433+
"avatar_url": "https://avatars.githubusercontent.com/u/43513935?v=4",
4434+
"profile": "https://github.com/PandPirate",
4435+
"contributions": [
4436+
"question",
4437+
"bug",
4438+
"test",
4439+
"userTesting"
4440+
]
4441+
},
4442+
{
4443+
"login": "Mandrukamal",
4444+
"name": "Kamal Kumar Mandru",
4445+
"avatar_url": "https://avatars.githubusercontent.com/u/63830754?v=4",
4446+
"profile": "https://github.com/Mandrukamal",
4447+
"contributions": [
4448+
"code",
4449+
"doc",
4450+
"userTesting",
4451+
"bug"
4452+
]
4453+
},
4454+
{
4455+
"login": "Hobbs04067",
4456+
"name": "Tyler J Keller",
4457+
"avatar_url": "https://avatars.githubusercontent.com/u/190901860?v=4",
4458+
"profile": "https://github.com/Hobbs04067",
4459+
"contributions": [
4460+
"content",
4461+
"research",
4462+
"test"
4463+
]
4464+
},
4465+
{
4466+
"login": "JoseAndresVargas",
4467+
"name": "Jose AndrΓ©s Vargas Serrano",
4468+
"avatar_url": "https://avatars.githubusercontent.com/u/70724263?v=4",
4469+
"profile": "https://github.com/JoseAndresVargas",
4470+
"contributions": [
4471+
"code",
4472+
"doc"
4473+
]
4474+
},
4475+
{
4476+
"login": "mfarrasmajid",
4477+
"name": "Muhammad Farras Majid",
4478+
"avatar_url": "https://avatars.githubusercontent.com/u/47713041?v=4",
4479+
"profile": "https://mfarrasmajid.id/",
4480+
"contributions": [
4481+
"question",
4482+
"code",
4483+
"doc",
4484+
"security",
4485+
"test",
4486+
"tutorial"
4487+
]
44014488
}
44024489
],
44034490
"contributorsPerLine": 7,

β€Ž.github/CODEOWNERSβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @open-sauced/docs
1+
* @BekahHW @adiati98

β€Ž.github/ISSUE_TEMPLATE/add_contributor.ymlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body:
1717
id: terms
1818
attributes:
1919
label: Code of Conduct
20-
description: By submitting this issue, you agree to follow our [Code of Conduct](https://docs.opensauced.pizza/contributing/code-of-conduct/)
20+
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/OpenSource-Communities/.github/blob/main/CODE_OF_CONDUCT.md)
2121
options:
2222
- label: I agree to follow this project's Code of Conduct
2323
required: true

β€Ž.github/PULL_REQUEST_TEMPLATE.mdβ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ For example: This PR adds <your-github-username> as a contributor.
1414

1515
## Related Issues
1616

17-
<!--
17+
<!--
1818
Add your related issue **below** this line and **outside** of the comment tags.
1919
2020
Please use this format to link your issue: Closes #XXX.
2121
Change "XXX" to your issue number that you can find next to your issue's title.
2222
23-
More information about link issue: https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue
23+
More information about link issue: https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue
2424
-->
2525

2626
## Contributors Checklist
@@ -56,8 +56,8 @@ More information about link issue: https://docs.github.com/en/issues/tracking-yo
5656
commits if your PR already received reviews or comments.
5757
5858
Before submitting a Pull Request, please ensure you've done the following:
59-
- πŸ“– Read the Open Sauced Contributing Guide: https://github.com/open-sauced/.github/blob/main/CONTRIBUTING.md.
60-
- πŸ“– Read the Open Sauced Code of Conduct: https://github.com/open-sauced/.github/blob/main/CODE_OF_CONDUCT.md.
59+
- πŸ“– Read the Contributing Guide: https://github.com/OpenSource-Communities/guestbook/blob/main/CONTRIBUTING.md.
60+
- πŸ“– Read the Code of Conduct: https://github.com/OpenSource-Communities/.github/blob/main/CODE_OF_CONDUCT.md.
6161
- πŸ‘·β€β™€οΈ Create small PRs. In most cases, this will be possible.
6262
- πŸ“ Use descriptive commit messages.
6363
- πŸ“— Update any related documentation and include any relevant screenshots.

β€ŽCONTRIBUTING.mdβ€Ž

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Contributing to OpenSauced Guestbook
1+
# Contributing Guidelines
22

3-
This repository is part of our [Intro to Open Source course](https://opensauced.pizza/learn/intro-to-oss/). We recommend you to take and complete the course before you contribute to this repository.
3+
This repository is part of the [Intro to Open Source course](https://opensauced.pizza/learn/intro-to-oss/). We recommend you to take and complete the course before you contribute to this repository.
44

5-
Contributions are always welcome, no matter how large or small. Before you begin, please read our [Code of Conduct](https://opensauced.pizza/docs/contributing/code-of-conduct/) and follow the directions below:
5+
Contributions are always welcome, no matter how large or small. Before you begin, please read our [Code of Conduct](https://github.com/OpenSource-Communities/.github/blob/main/CODE_OF_CONDUCT.md) and follow the directions below:
66

77
## Recommended Communication Style
88

@@ -14,9 +14,9 @@ Contributions are always welcome, no matter how large or small. Before you begin
1414
## Issues
1515

1616
- Issues with the `needs triage` label are unavailable until they are triaged and the label is removed. Feel free to check on the issue regularly if you want to work on it.
17-
- If you wish to work on an open issue, you can comment on it and tag `@open-sauced/docs`. Please refrain from working on an issue before it's assigned to you.
17+
- If you wish to work on an open issue, you can comment on it and tag the maintainers. Please refrain from working on an issue before it's assigned to you.
1818

19-
In case you get stuck, feel free to ask for help in the [discussion](https://github.com/open-sauced/guestbook/discussions/categories/q-a).
19+
In case you get stuck, feel free to ask for help in the [discussion](https://github.com/Virtual-Coffee/guestbook/discussions/categories/q-a).
2020

2121
## Getting Started
2222

0 commit comments

Comments
Β (0)