diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-14 16:19:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-14 16:19:03 (GMT) |
| commit | da03e2d6c60f70f6dfe581e130067b2dde4517fc (patch) | |
| tree | bd422d8dfffc733a2988d1c2d97658b6e2e51d47 /Source/kwsys/.gitattributes | |
| parent | 2413075765228001a205017c670abbefdf3b7f61 (diff) | |
| parent | a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf (diff) | |
| download | CMake-da03e2d6c60f70f6dfe581e130067b2dde4517fc.zip CMake-da03e2d6c60f70f6dfe581e130067b2dde4517fc.tar.gz CMake-da03e2d6c60f70f6dfe581e130067b2dde4517fc.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-12-14 (95a7e234)
Diffstat (limited to 'Source/kwsys/.gitattributes')
| -rw-r--r-- | Source/kwsys/.gitattributes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/.gitattributes b/Source/kwsys/.gitattributes index a9c4e77..a121ad1 100644 --- a/Source/kwsys/.gitattributes +++ b/Source/kwsys/.gitattributes @@ -1,7 +1,5 @@ .git* export-ignore -/CONTRIBUTING.rst conflict-marker-size=78 - *.c whitespace=tab-in-indent,no-lf-at-eof *.h whitespace=tab-in-indent,no-lf-at-eof *.h.in whitespace=tab-in-indent,no-lf-at-eof @@ -10,3 +8,5 @@ *.hxx.in whitespace=tab-in-indent,no-lf-at-eof *.txt whitespace=tab-in-indent,no-lf-at-eof *.cmake whitespace=tab-in-indent,no-lf-at-eof + +*.rst whitespace=tab-in-indent conflict-marker-size=79 |