From 5b1d51c2bf016ff3a66cc4655c8e5c40af120dca Mon Sep 17 00:00:00 2001 From: Gerard Lynch Date: Mon, 23 Feb 2015 22:20:33 +0000 Subject: updated changelog with 1.8.2-4 content, added .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..a19ade077d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union -- cgit v1.2.3