~cosmicrose/liberator_example

d14014277cdc803a8ef895f80aac0651cea7108e — Rosa Richter 8 months ago 8042e66 main
Reduce potential changelog merge conflicts
1 files changed, 5 insertions(+), 2 deletions(-)

M .gitattributes
M .gitattributes => .gitattributes +5 -2
@@ 1,2 1,5 @@
# Auto detect text files and perform LF normalization
* text=auto
# SPDX-FileCopyrightText: 2021 Rosa Richter
#
# SPDX-License-Identifier: CC0-1.0

CHANGELOG.md merge=union