removed CHANGELOG.md merge=union

What does this MR do?

this MR removed in https://gitlab.com/foodsharing-dev/foodsharing/-/blob/master/.gitattributes#L1 CHANGELOG.md merge=union. Instead of always removing the duplicate entries, I would like to try to resolve the conflicts. Since we started working with squash commits, we can merge the master into the feature branch.

How confident are you it won't break things if deployed?

Links to related issues

https://yunity.slack.com/archives/C1T1ZM9A4/p1694452788676499

How to test

Screenshots (if applicable)

Checklist

• added a test, or explain why one is not needed/possible...
• no unrelated changes
• asked someone for a code review
• set a "for:" label to indicate who will be affected by this change
• added to the next milestone (see https://gitlab.com/foodsharing-dev/foodsharing/-/milestones, unless it has a "for:Dev" label)
• added an entry to CHANGELOG.md
• added a short text in the release notes to /release-notes/YYYY-MM.md
• Once your MR has been merged, you are responsible to create a testing issue in the Beta Testing forum: https://foodsharing.de/?page=bezirk&bid=734&sub=forum. Please change the MRs label to "state:Beta testing".
  • Consider writing a detailed description in German.
  • Describe in a few sentences, what should be tested from a user perspective.
  • Also mention different settings (e.g. different browsers, roles, ...) how this change can be tested.
  • Be aware, that also non technical people should understand.