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

Merge pull request #6453 from influxdata/er-changelog 

Attempt to use union merge strategy on CHANGELOG
pull/6458/head
Edd Robinson 2016-04-22 18:21:33 +01:00
parent 9c1fa76f3c 23bb5d95a6
commit 42a073b408
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