diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 150db1aef4..7d5be40ba5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,2 @@ -CHANGELOG.md merge=union .github/ export-ignore hacking/ export-ignore -ticket-stubs/ export-ignore |