diff options
author | Marcin Aman <marcin.aman@gmail.com> | 2021-09-08 10:41:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-08 10:41:30 +0200 |
commit | 539cfb503d48f26c39237b12293f6f72c9ac50c1 (patch) | |
tree | 9bbfe4567b28468b431b6edb2ab2c96473af41da /.gitattributes | |
parent | 37243ad7a5152d4f0f30bb8f1446d4d5c6ce2094 (diff) | |
download | dokka-539cfb503d48f26c39237b12293f6f72c9ac50c1.tar.gz dokka-539cfb503d48f26c39237b12293f6f72c9ac50c1.tar.bz2 dokka-539cfb503d48f26c39237b12293f6f72c9ac50c1.zip |
Bring back mergin of divergent entries (#2121)
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions