Merge conflict practice#98
Open
khoav22 wants to merge 16 commits intoCSS360-2026-Winter:merge-conflict-practicefrom
Open
Merge conflict practice#98khoav22 wants to merge 16 commits intoCSS360-2026-Winter:merge-conflict-practicefrom
khoav22 wants to merge 16 commits intoCSS360-2026-Winter:merge-conflict-practicefrom
Conversation
istory section of the README.md file.
…award Added link for NSF Award to the acknowledgements section of README.md
Added link for NSF Award to the acknowledgements section of README.md
add link to replace the Dickinson College Farm
Adds Dickinson College Farm URL
…nome-add Updated link for issue CSS360-2026-Winter#38 on README file
Changed the text saying "the Dickinson College Farm" on README.md to a link to their website
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request Description
I did the 5.7 extra practice for the merge-conflict-practice
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.