Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1184 from influxdata/no-more-changelog-conflicts 

Resolve CHANGELOG.md conflicts by keeping both changes
pull/1187/head
Chris Goller 2017-04-04 17:43:21 -05:00 committed by GitHub
parent 3edd1bf52c d075dbdc11
commit 324987a753
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
CHANGELOG.md merge=union