From d04dfcd63ea2478ffdff2e966d310194dafd8d7d Mon Sep 17 00:00:00 2001 From: "Max P." Date: Sat, 10 May 2025 17:25:51 +0200 Subject: [PATCH] chore(git): ignore merge conflicts for CHANGELOG.md --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..02304b1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=ours