Skip to content
Permalink
Browse files

Teach git how to merge our CHANGELOG (#3242)

  • Loading branch information...
deivid-rodriguez authored and mrcasals committed Apr 17, 2018
1 parent 14c7b94 commit e34b937a6f69558f4afd9d417bf0031141cbf3be
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitattributes
@@ -1,3 +1,4 @@
* text=auto
*/vendor/* -text
bundle.js binary
CHANGELOG.md merge=union

0 comments on commit e34b937

Please sign in to comment.
You can’t perform that action at this time.