fixed merge conflict and added name to participants#71
Open
conner-whitfield wants to merge 5 commits into
Open
fixed merge conflict and added name to participants#71conner-whitfield wants to merge 5 commits into
conner-whitfield wants to merge 5 commits into
Commits
Commits on Feb 12, 2020
- committed
- committed