diff options
| author | Hernan <hernan.grecco@gmail.com> | 2021-01-07 01:08:55 -0300 |
|---|---|---|
| committer | Hernan <hernan.grecco@gmail.com> | 2021-01-07 01:08:55 -0300 |
| commit | 44bb57f9fff6e69742f548fa20fe043d7bf8a3b5 (patch) | |
| tree | 967f26c45938f16814ccee9af19d7f7c3d110c98 /.gitattributes | |
| parent | 3484cdec44ae15f4f3675372c384d9d6caaa3cf9 (diff) | |
| download | pint-44bb57f9fff6e69742f548fa20fe043d7bf8a3b5.tar.gz | |
automerge for changes
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..8383fff --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGES merge=union |