dickinson-comp190 / GitKit-FarmData2-S24

Other
0 stars 16 forks source link

Changes that conflict with Round2 Issues. #82

Closed wpgoble closed 7 months ago

wpgoble commented 7 months ago

Each of the 190-Round2 issues in the issue tracker add links to the README.md file. This commit, when merged into main will introduce changes that conflict with all of the changes requested by those issues. It should be merged after students synch with main and as or just after they submit their PR's for the 190-Round2 issues.

Pull Request Description

Example of creating merge conflicts


Licensing Certification

FarmData2 is a Free Cultural Work and all accepted contributions are licensed as described in the LICENSE.md file. This requires that the contributor holds the rights to do so. By submitting this pull request I certify that I satisfy the terms of the Developer Certificate of Origin for its contents.