diff --git a/Challenges/challange_8.md b/Challenges/challange_8.md new file mode 100644 index 000000000..2e0182139 --- /dev/null +++ b/Challenges/challange_8.md @@ -0,0 +1 @@ +created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8 diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md index 701d59f78..176e58712 100644 --- a/Challenges/challenge_6.md +++ b/Challenges/challenge_6.md @@ -1,8 +1,12 @@ + +Welcome to the sixth challenge! + ## Welcome to Challenge 6 Welcome to the sixth challenge! Today's goal is to update your pull request that you created in [Challenge 5](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_5.md?plain=1) + Task 1. Create a new commit in the branch you created in Challenge 2 in your forked repository 2. The change that you have to make should be the following: @@ -12,6 +16,9 @@ In the markdown file that was created in Challenge 5, edit the details as follow name: your_name github_user_name: YOUR-GITHUB-USERNAME url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge + +url_of_github_isse: Link_of_the_github_issue_created_in_first_challenge + --- ``` 3. After making this change create a commit with a proper commit message and push the changes diff --git a/Challenges/challenge_6.md.orig b/Challenges/challenge_6.md.orig new file mode 100644 index 000000000..701d59f78 --- /dev/null +++ b/Challenges/challenge_6.md.orig @@ -0,0 +1,19 @@ +## Welcome to Challenge 6 + +Welcome to the sixth challenge! +Today's goal is to update your pull request that you created in [Challenge 5](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_5.md?plain=1) + +Task +1. Create a new commit in the branch you created in Challenge 2 in your forked repository +2. The change that you have to make should be the following: +In the markdown file that was created in Challenge 5, edit the details as follows: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +--- +``` +3. After making this change create a commit with a proper commit message and push the changes +4. Check if the commit reflects in the Pull request you created in Challenge 5 + diff --git a/challengers-list.md b/challengers-list.md index 2fb6f60ea..aab86b84c 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,4 +1,6 @@ # List of challengers 1. [Mrinal](https://github.com/mrinal1224) 2. [Shivay](https://github.com/shivaylamba) +3. [Prashant Gavel](https://github.com/gavelprashant99) 3. [Raghav](https://github.com/raghavdhingra) + diff --git a/contributors/gavelprashant99/file_to_be_stashed.md b/contributors/gavelprashant99/file_to_be_stashed.md new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/contributors/gavelprashant99/file_to_be_stashed.md @@ -0,0 +1 @@ + diff --git a/contributors/gavelprashant99/gavelprashant99.md b/contributors/gavelprashant99/gavelprashant99.md new file mode 100644 index 000000000..7a8457136 --- /dev/null +++ b/contributors/gavelprashant99/gavelprashant99.md @@ -0,0 +1,4 @@ +name: Prashant Gavel +github_user_name: gavelprashant99 +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/202 +your_favroite_programming_language: JavaScript diff --git a/resolving-merge-conflict b/resolving-merge-conflict new file mode 160000 index 000000000..af7bd708e --- /dev/null +++ b/resolving-merge-conflict @@ -0,0 +1 @@ +Subproject commit af7bd708e64f4595b22d2756671c3e48a03cfe8d