UniversityOfSaskatchewanCMPT371 / term-project-2024-team-1

4 stars 0 forks source link

Issue 174: POST/api/survey/:surveyId #205

Closed KhoaNguyen178 closed 5 months ago

KhoaNguyen178 commented 5 months ago

Resolves #174

kurtp21 commented 5 months ago

You have some merge conflicts in the SurveyController.ts file

KhoaNguyen178 commented 5 months ago

Resolved, apparently some new PR was merged into dev last night after I made my PR causing the conflict.