Closed a-parris21 closed 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
issue-19
issue-20
main
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:
mainOutputDir()
outputDir
Issue closed by: https://github.com/a-parris21/ap21-ssg/commit/c1359b4
Resolved the conflicts when merging
issue-19
andissue-20
branches intomain
branch: https://github.com/a-parris21/ap21-ssg/commit/d150685However, I accepted the merge for the
mainOutputDir()
function from the wrong branch so I adjusted the code to resolve this. Only changes made were:outputDir
parameter to themainOutputDir()
functionoutputDir
so thatmainOutputDir()
function would use its parameter instead of the default file pathIssue closed by: https://github.com/a-parris21/ap21-ssg/commit/c1359b4