From 6e2353307f223a7d5b8b6c7075700b16ae234eab Mon Sep 17 00:00:00 2001
From: Amos Ng <amosng1@gmail.com>
Date: Sun, 14 Jun 2020 05:03:53 +0800
Subject: [PATCH] Added .gitattributes to help sort out CHANGELOG.md merge
 conflicts

---
 .gitattributes | 1 +
 CHANGELOG.md   | 1 +
 2 files changed, 2 insertions(+)
 create mode 100755 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100755
index 0000000..a19ade0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 019a051..8080f3a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - [2020-06-13] Allow for the two log levels to be configurable by [@lflare].
 - [2020-06-13] Added X-Cache header to image responses by [@lflare].
+- [2020-06-13] Added .gitattributes to help sort out CHANGELOG.md merge conflicts by [@lflare].
 
 ### Changed
 - [2020-06-13] Modified AsyncAppender queue size to 1024 by [@lflare].