summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMichaël Ball <michael.ball@gmail.com>2017-11-18 19:07:09 +0000
committerMichaël Ball <michael.ball@gmail.com>2017-11-18 19:07:09 +0000
commit8711da9cc7b2af31ecf1353d052a2d4f861ec19d (patch)
treefba7f605daf23b1f350a6cca668d78623bb5aba6 /LICENSE
parentfb7a21523bc95d6d0872aaefa178156ae8965eba (diff)
More merge mess-ups
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions