North-Seattle-College / ad440-winter2021-thursday-repo

NSC AD 440 Winter 2021 Thursday cohort practicum repo
Apache License 2.0
2 stars 27 forks source link

removed merge conflict remnants #277

Closed unicornsleuth closed 3 years ago

unicornsleuth commented 3 years ago

So I noticed that the file that got merged in had both my new code and the previous code, due to a merge conflict, so I just removed the old code.

Coding: 2 minutes