diff options
| author | Florian Pritz <bluewind@xinu.at> | 2022-01-09 11:31:26 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2022-01-09 11:31:26 +0100 |
| commit | 5fb561ed3d972659213de47cb67fdc094adfbc1e (patch) | |
| tree | febd9f7e45d93801c2207691532cad144a848179 /.gitattributes | |
| parent | 82141c4baf5a1436b6eca8b1efa6e2bff3991179 (diff) | |
| parent | ad57720c57c11620c77181655d637a5bfdbe2643 (diff) | |
Merge remote-tracking branch 'upstream/3.1-stable' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index a4296d591..b4f0b6cbb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,8 +18,6 @@ readme.rst tests/codeigniter/ export-ignore tests/travis/ export-ignore -# User Guide Source Files -user_guide_src - -# User Guide Compiled Files +# User Guide source files and compiled files +user_guide_src export-ignore user_guide export-ignore |