From b2370089f309ceff1be916c6ecf57a6e2708ce18 Mon Sep 17 00:00:00 2001
From: Chris Llanwarne <cjllanwarne@gmail.com>
Date: Thu, 4 Feb 2016 10:36:15 -0500
Subject: [PATCH] Added a changelog file

---
 .gitattributes | 8 ++++++++
 CHANGELOG.MD   | 5 +++++
 2 files changed, 13 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 CHANGELOG.MD

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..49c97c8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+# This file can always be added to, line additions should never collide.
+CHANGELOG.MD merge=union
+
+# These files are text and should be normalized (Convert crlf => lf)
+*.scala text
+*.MD text
+*.java text
+*.html text
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
new file mode 100644
index 0000000..8da3fcf
--- /dev/null
+++ b/CHANGELOG.MD
@@ -0,0 +1,5 @@
+# WdlTool Change Log
+
+0.1:
+=====
+