a-parris21 / ap21-ssg

repos for DPS909 release 0.1
MIT License
0 stars 1 forks source link

Merge conflicts between solutions for issue-19 & issue-20 #21

Closed a-parris21 closed 2 years ago

a-parris21 commented 2 years ago

Resolved the conflicts when merging issue-19 and issue-20 branches into main branch: https://github.com/a-parris21/ap21-ssg/commit/d150685

However, I accepted the merge for the mainOutputDir() function from the wrong branch so I adjusted the code to resolve this. Only changes made were:

Issue closed by: https://github.com/a-parris21/ap21-ssg/commit/c1359b4