diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-03-09 15:57:34 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-03-09 15:57:45 +0100 |
| commit | 42f123bb3c6eb8faf48173aa939b478c57d132e6 (patch) | |
| tree | e3cd8fafeb306ffab085dd02e1c4c566b9491742 /.gitattributes | |
| parent | 63e40c9f8ac12e280ae89e938916d5a65bdda8c2 (diff) | |
| parent | 7076c45016ac68aaf1cf15e499a8a435ce14f501 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: I9b374c2520417955e940b280c80c70731d123f05
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 1a045fa..018cf2c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ .tag export-subst .gitignore export-ignore .gitattributes export-ignore -.commit-template export-ignore |