emmet0r / FarmData2-catalyst

This is a copy of the main FarmData2 repository, used solely for teaching Git/GitHub workflow. Please visit https://github.com/farmdata2 if you would like to contribute to the FarmData2 project 🧑‍🌾
Other
0 stars 5 forks source link

Merge conflict practice #50

Open klbynum opened 2 months ago

klbynum commented 2 months ago

Pull Request Description

I have merge the "different" link.

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.