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

Another pull request for practice #16

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Another pull request for practice #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
490d2db
Add day14 README that will be used by students to generate commits an…
Jul 26, 2021
9bc1150
edit from shirley
shirleymango Jul 26, 2021
cbb3da4
“changes”
meghanaguttikonda Jul 26, 2021
c2a8228
adding index.html
shirleymango Jul 26, 2021
7f6323a
Merge pull request #2 from meghanaguttikonda/main
dumbbillyhardy Jul 26, 2021
544aacf
Merge branch 'main' into main
dumbbillyhardy Jul 26, 2021
6ebbb1c
Merge pull request #4 from shirleymango/main
dumbbillyhardy Jul 26, 2021
03595e1
deleted additional files bc I started late, recreated readme file, da…
mahathi-m Jul 27, 2021
a79d804
creating a conflict
mahathi-m Jul 27, 2021
8727dde
real conflict
mahathi-m Jul 27, 2021
6347646
4th try
mahathi-m Jul 27, 2021
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
5 changes: 5 additions & 0 deletions day14/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Mahathi just created a new file in day14. Testing testing!

Hi!
I am trying to create a conflictthis is bad conflic editing the same line ! yayy t

Empty file added day14/index.html
View file
Open in desktop
Empty file.