aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorPjotr Prins2018-06-29 12:56:08 +0000
committerPjotr Prins2018-06-29 12:56:08 +0000
commit1c2dbad9b627b67ff91158480335d499106b4e50 (patch)
tree6554e972f830de5e377b45d8d9d07b9612edee12 /LICENSE
parentcee92876e456299e14afd51e0b719384c48c5286 (diff)
parent9f9887eb5befe025e85641f1930e46e5e6a25e56 (diff)
downloadpangemma-1c2dbad9b627b67ff91158480335d499106b4e50.tar.gz
Fix conflict
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions