search

emmet0r / GitKit-FarmData2

Other
0 stars 5 forks source link

Merge conflict practice #56

Closed snwarner22 closed 1 year ago

snwarner22 commented 1 year ago

Pull Request Description

--- __Licensing Certification__ FarmData2 is a [Free Cultural Work](https://freedomdefined.org/Definition) 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](https://developercertificate.org/)__ for its contents.