New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MS2-Demo merge conflict resolution fix #87

Merged

Ai-Albert merged 2 commits into MS2-Demo from MS2-Demo-Fix

Mar 17, 2023

Owner

Ai-Albert commented Mar 17, 2023

Added stuff left out from last minute messy merge conflicts.

Ai-Albert added 2 commits

March 17, 2023 00:08


          Fixed test

941580b


          Added missing stuff from merge conflicts

7b3f056

vs2961 approved these changes

View reviewed changes

Contributor

vs2961 left a comment

It seems like the failing tests are due to the heap error that was discussed on Piazza, so the tests pass. Glad that the app works again!

Ai-Albert merged commit 4ad4b58 into MS2-Demo

Ai-Albert deleted the MS2-Demo-Fix branch

March 18, 2023 07:06

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment