~cosmicrose/liberator

0df2edd39b771859d9389b46e7fb9accffbc4c44 — Rosa Richter 4 months ago ed6c1c2
Reduce potential changelog merge conflicts
1 files changed, 2 insertions(+), 3 deletions(-)

M .gitattributes
M .gitattributes => .gitattributes +2 -3
@@ 1,6 1,5 @@
# SPDX-FileCopyrightText: 2021 Rosa Richter
#
# SPDX-License-Identifier: MIT
# SPDX-License-Identifier: CC0-1.0

# Auto detect text files and perform LF normalization
* text=auto
CHANGELOG.md merge=union