Closed kellyyun closed 2 years ago
Screenshots below:
<img width="636" alt="Screen Shot 2022-01-11 at 7 38 53 AM" src="https://user-images.githubuse
rcontent.com/97000774/148944096-67d7fc76-e730-4c39-941b-4f730771a1c5.png">
Resolved conflicts in index.html (old title "Hello, World!" was in the wage-gap branch) and styles.css (essentially the same file, so just chose one).
Screenshots below:
<img width="636" alt="Screen Shot 2022-01-11 at 7 38 53 AM" src="https://user-images.githubuse
rcontent.com/97000774/148944096-67d7fc76-e730-4c39-941b-4f730771a1c5.png">