Closed YichenTang97 closed 5 years ago
Conflicts from #140. (import "bootstrap")
Fixed the conflictions in the new changes
Also just a note, probably will be hard at this stage as the methods are quite big, but can add some tests with the service, maybe even as a separate PR considering the size.
Also just a note, probably will be hard at this stage as the methods are quite big, but can add some tests with the service, maybe even as a separate PR considering the size.
Will be adding the tests in next PR.
LGTM; will unblock once #142 is merged and this branch is tested on Windows :+1:
Rebasing this branch to the latest master after #157 and #152......
......Done
Tested against manual test steps in #157 and #152
Merge conflicts fixed: adapted changes made in #162.
Fixes #6, fixes #27, fixes #28, fixes #31, and a partial process of #81.
Manual test steps:
Test one:
Test two: