Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit f3ef34c

Browse files
committed
chnaged the file
2 parents b467444 + 7d7c28f commit f3ef34c

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

Challenges/challenge_16.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Welcome to Challenge 16
2+
3+
Welcome to the 16th Challenge
4+
5+
In this 2 part challenge, we will try to emulate and fix merge conflicts via git.
6+
7+
Today is the second and final part of this challenge:
8+
9+
Task:
10+
1. You will notice that your pull request will have a conflict: <img width="636" alt="image" src="https://user-images.githubusercontent.com/19529592/190574995-0cc506a8-a2fe-4aa4-98bd-4658e8aa2fc1.png">
11+
12+
2. Try to resolve this merge conflict using local git
13+
14+
3. Once resolved, share screenshot on the github issue created in the previous challenges

challengers-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
1. [Mrinal](https://github.com/mrinal1224)
33
2. [Shivay](https://github.com/shivaylamba)
44
3. [Harshit_Dongre](https://github.com/Harshit1020)
5-
5+
4. [Raghav](https://github.com/raghavdhingra)

contributors/Harshit1020/Harshit1020.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
name: Harshit Dongre
33
github_user_name: Harshit1020
44
url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/290
5-
your_favroite_programming_language: javascript
5+
your_favroite_programming_language: Javascript
66
---

0 commit comments

Comments
 (0)