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

Another pull request for practice - #16

Open

mahathi-m wants to merge 11 commits into

google:mainfrom

mahathi-m:rewrite-about

Commits on Jul 26, 2021

Add day14 README that will be used by students to generate commits and merge conflicts
Billy Hardy
committed
490d2db
edit from shirley
shirleymango
committed
9bc1150
“changes”
meghanaguttikonda
committed
cbb3da4
adding index.html
shirleymango
committed
c2a8228
Merge pull request #2 from meghanaguttikonda/main
dumbbillyhardy
authored
7f6323a
Merge branch 'main' into main
dumbbillyhardy
authored
544aacf
Merge pull request #4 from shirleymango/main
dumbbillyhardy
authored
6ebbb1c

Commits on Jul 27, 2021

deleted additional files bc I started late, recreated readme file, day 14
mahathi-m
committed
03595e1
creating a conflict
mahathi-m
committed
a79d804
real conflict
mahathi-m
committed
8727dde
4th try
mahathi-m
committed
6347646