Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved Merge Conflict #1101

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
dc096b7
made changes in challenge3.md file
nivasreddynalla Sep 4, 2023
ce6e47f
Merge branch 'main' into Niivas-details
Niivas Sep 4, 2023
40e1b61
Merge remote-tracking branch 'upstream/main' into Niivas-details
Niivas Sep 5, 2023
82246a5
Added a contributor in contributors directory
Niivas Sep 5, 2023
927c128
Added a contributor in contributors directory
Niivas Sep 5, 2023
8fb5a24
Merge remote-tracking branch 'upstream/main'
Niivas Sep 6, 2023
1fca6a3
Merge remote-tracking branch 'upstream/main' into Niivas-details
Niivas Sep 6, 2023
ae5f47e
Added issue url
Niivas Sep 6, 2023
52dd0c0
Added issue url to to contributor file
Niivas Sep 6, 2023
900fc9b
Merge remote-tracking branch 'upstream/main'
Niivas Sep 7, 2023
5152011
Merge branch 'scaleracademy:main' into Niivas-details
Niivas Sep 7, 2023
3ea5be3
Added a second file to the contributor
Niivas Sep 7, 2023
5a7ba3e
Added a second file
Niivas Sep 7, 2023
c2ba0bf
Remove the recently added file
Niivas Sep 7, 2023
47c6d6f
Merge branch 'main' of https://github.com/Niivas/scaler-open-source-s…
Niivas Sep 7, 2023
5c7c32d
Merge remote-tracking branch 'upstream/main'
Niivas Sep 8, 2023
4ea656a
Merge remote-tracking branch 'upstream/main'
Niivas Sep 9, 2023
9bc8b74
Added some dummy content-1
Niivas Sep 9, 2023
287ff46
Added some dummy content-2
Niivas Sep 9, 2023
cdb3f05
Squashed two commits to one using IRE
Niivas Sep 9, 2023
d35d018
Merge branch 'challenge8' of https://github.com/Niivas/scaler-open-so…
Niivas Sep 10, 2023
e7910fc
Merge remote-tracking branch 'upstream/main' into challenge8
Niivas Sep 10, 2023
b330460
added extra content to markdown file
Niivas Sep 10, 2023
8cf1752
Merge remote-tracking branch 'upstream/main' into Niivas-details
Niivas Sep 11, 2023
8736ddf
Merge remote-tracking branch 'upstream/main' into Niivas-details
Niivas Sep 12, 2023
72168a5
Merge remote-tracking branch 'upstream/main'
Niivas Sep 12, 2023
94fe9a5
Added an extra field to Niivas file
Niivas Sep 12, 2023
c618e8f
Merge remote-tracking branch 'upstream/main'
Niivas Sep 13, 2023
0ea3c3e
Merge remote-tracking branch 'upstream/main' into Niivas-details
Niivas Sep 13, 2023
1224ad1
Created two gists and added links to gist-solutions.md file
Niivas Sep 13, 2023
7b22df3
Created two gists and added links to gist-solutions.md file
Niivas Sep 13, 2023
f16b126
Merge branch 'scaleracademy:main' into main
Niivas Sep 14, 2023
d083c3b
day 14 commit-1
Niivas Sep 14, 2023
9b0ba00
day 14 commit-2
Niivas Sep 14, 2023
0eaa33c
day 14 commit-3
Niivas Sep 14, 2023
0712634
day 14 commit-4
Niivas Sep 14, 2023
01341cb
day 14 commit-3
Niivas Sep 14, 2023
c6d6e5d
Merge branch 'scaleracademy:main' into main
Niivas Sep 15, 2023
044ada1
Merge branch 'scaleracademy:main' into main
Niivas Sep 16, 2023
4470dae
Commit all previous uncommits
Niivas Sep 16, 2023
8a0689b
Resolved merge conflict
Niivas Sep 17, 2023
ef0a6d8
Merge branch 'scaleracademy:main' into main
Niivas Sep 18, 2023
4ea42d8
Merge branch 'scaleracademy:main' into main
Niivas Sep 19, 2023
acc6fef
Merge branch 'scaleracademy:main' into main
Niivas Sep 20, 2023
27c4fd2
Merge branch 'scaleracademy:main' into main
Niivas Sep 22, 2023
9d3a272
Merge branch 'scaleracademy:main' into main
Niivas Sep 22, 2023
c74efe5
Merge branch 'scaleracademy:main' into main
Niivas Sep 23, 2023
0fd5cf7
Merge branch 'scaleracademy:main' into main
Niivas Sep 25, 2023
2292483
Challenge 23
Niivas Sep 25, 2023
1e6fc24
Merge branch 'scaleracademy:main' into main
Niivas Sep 29, 2023
5573785
Merge branch 'scaleracademy:main' into main
Niivas Sep 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added issue url
Niivas committed Sep 6, 2023
commit ae5f47e86013bac3c25cf388ae222dd75d2c3336
1 change: 1 addition & 0 deletions contributors/Niivas/Niivas.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
Name: Nivas Reddy Nalla
Github_user: Niivas
url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/223
---