Skip to content
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.

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

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

Closed
a-parris21 opened this issue Oct 2, 2022 · 1 comment
Closed

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

a-parris21 opened this issue Oct 2, 2022 · 1 comment

Comments

@a-parris21
Copy link
Owner

No description provided.

@a-parris21 a-parris21 changed the title Conflicts between solutions for issue-19 & issue-20 Merge conflicts between solutions for issue-19 & issue-20 Oct 2, 2022
@a-parris21
Copy link
Owner Author

Resolved the conflicts when merging issue-19 and issue-20 branches into main branch: 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:

  • added the outputDir parameter to the mainOutputDir() function
  • replaced references to the default file path with outputDir so that mainOutputDir() function would use its parameter instead of the default file path

Issue closed by: c1359b4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant