aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGian Demarmels <gian@demarmels.org>2022-02-04 16:50:32 +0100
committerGian Demarmels <gian@demarmels.org>2022-02-04 16:50:32 +0100
commita67786078bb3617ea8d4d308b21781fd0a1c2258 (patch)
tree67d476fe3e096001997f6de77d1db92bcd643bbb /doc
parent8674f32aec8113ced6b2c2be625728b31158fff8 (diff)
resolves merge conflicts
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions