diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-07-28 11:21:25 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-07-28 11:21:25 +0200 |
| commit | 16436239cd35ba7346b89a1f57d5b29dc786f4c6 (patch) | |
| tree | 7e9011d0dfdda5ef9ccc302dae69ab3e5ba4b8cc /.gitattributes | |
| parent | 5a5b9c2344b961e984a2c860bb0c33022d641f32 (diff) | |
| parent | 89d3486ad18d782a8141037a2bffb7992118cc78 (diff) | |
Merge qtquickcontrols2 into qtdeclarative
Task-number: QTBUG-95173
Change-Id: I2cf31e30127e8cc2f10304cabf4ff7f5050633b8
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 |