search

cs-worcester-cs-348-02-fall-2023 / GitKit-FarmData2

Other
0 stars 23 forks source link

Merge conflict practice #89

Closed Anton-Duong closed 1 year ago

Anton-Duong 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.
kwurst commented 1 year ago

I am not merging this because it has all the line endings changed. That is not your fault.

Otherwise it is what you were supposed to do.