diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-08-05 09:57:51 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-08-06 16:23:00 +0200 |
| commit | 7bc209c2c52898fc9f806f90e7b5053a8311494b (patch) | |
| tree | 8a04fd03bf86c65d66ae71f87d067120aeff78f2 /.gitattributes | |
| parent | ab96456f8d86aeb60b51dde4f4fe419b0156c9b2 (diff) | |
| parent | 57753efded8966c5533415723b42c4133213ed69 (diff) | |
Merge qtquickcontrols2 into qtdeclarative
Task-number: QTBUG-95173
Change-Id: I4293b23e6eb3e780bfd77546a885385eb4512eb1
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 9842d4e766..7be61e4c7e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ -*_crlf.* eol=crlf -.tag export-subst -.gitignore export-ignore -.gitattributes export-ignore +*_crlf.* eol=crlf +.tag export-subst +.gitignore export-ignore +.gitattributes export-ignore +.commit-template export-ignore |