diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 10:41:17 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 10:42:38 +0100 |
| commit | d758a3b055f822f268fcfa6524f63b611a9fbc26 (patch) | |
| tree | 53c1b334f849d768a7e987446844a7f0b025cea4 /.gitattributes | |
| parent | d2b26ede9c43b3543e4dbd3af33acc0b17a36467 (diff) | |
| parent | 273821d69c58f9c32b4e154dd7cebae1bc481877 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index df15048e..084cdfd6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,6 @@ .tag export-subst .gitignore export-ignore .gitattributes export-ignore -.gitmodules export-ignore .commit-template export-ignore init-repository export-ignore README.git export-ignore |