Reduce CHANGELOG.md conflicts.

luniehq · Aug 19, 2018 · c99fb77 · c99fb77
1 parent af2dbe2
commit c99fb77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/CHANGELOG.md merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * now resetting most store information on signing out to not have side effects between sessions @faboweb
 * import seed focus bug @okwme
 * fixed trying to subscribe to transaction rpc events multiple times (prevent unexpected side effects doing so) @faboweb
+* Reduce CHANGELOG.md conflicts. @NodeGuy
 
 ## [0.9.4] - 2018-08-08