Assignment submission by Jie Li

[Leejere]

No description provided.

[mjumbewu]

I think we talked about these conflicts already and saw that your code was passing. However, if you did want to resolve these conflicts, the easiest way would be with something like this:

# Add the class organization repository as a remote called "upstream" (if it's not already one)
git remote add upstream https://github.com/musa-611-fall-2022/school-explorer.git
# Fetch the code from the "upstream" repository, favoring that code in the event of a conflict
git pull --no-ff -X theirs upstream main
# Push those chages up to your repository.
git push