diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index e5ae179a9..6de7402a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,4 @@ theme/jqplot.canvasAxisTickRenderer.min.js binary theme/jqplot.highlighter.min.js binary theme/jquery.jqplot.min.js binary theme/jquery.min.js binary +CHANGELOG.md -text merge=union |