diff options
| author |   Unit 193 <unit193@unit193.net> | 2021-02-03 19:17:00 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2021-02-03 19:17:00 -0500 |
| commit | 3a0d66f07b112b6d2bdc2b57bbf717a89a351ce6 (patch) | |
| tree | a7cf56282e54f05785243bc1e903d6594f2c06ba /.gitattributes | |
| parent | 787b97a4cb24330b36f11297c6d3a7a473a907d0 (diff) | |
New upstream version 8.1.2.upstream/8.1.2
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d4ff363 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGES.txt merge=union |