X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.gitattributes;fp=.gitattributes;h=d4e37a2ed2f1e66962822e0e77f7da257e003f4d;hp=0000000000000000000000000000000000000000;hb=f4ccb17bb7b532041caf6c4709a3b1fe31f5e38a;hpb=2bc2bafed478dff7bd4043da8064eb3fdef389b8

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d4e37a2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=git-merge-changelog