summaryrefslogtreecommitdiff
path: root/conflict.mdwn
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-02-28 17:34:33 +0200
committerLars Wirzenius <liw@liw.fi>2018-02-28 17:34:33 +0200
commitb70698bfd6edb18d952f2cde0426e8227ffabc2e (patch)
treee45c509a37a4fee1fc9461774c05c73bd0c4fa53 /conflict.mdwn
parent2b6827536a83b21419e61443df4dc81b24530af6 (diff)
downloadnoir.liw.fi-b70698bfd6edb18d952f2cde0426e8227ffabc2e.tar.gz
Change: trigger CI
Diffstat (limited to 'conflict.mdwn')
0 files changed, 0 insertions, 0 deletions