aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar cel <cel@blos.sm>2022-07-16 22:57:56 +0100
committerLibravatar cel <cel@blos.sm>2022-07-16 22:57:56 +0100
commit598a36466e76d0c7c16a690a72d4a0e8d7326351 (patch)
tree513fc0696611e1ab0c8fb215dfd4561657e0b458 /Makefile
parentc5bacb265a477f1f80be6a9fbdabc072fc074a59 (diff)
download2022-598a36466e76d0c7c16a690a72d4a0e8d7326351.tar.gz
2022-598a36466e76d0c7c16a690a72d4a0e8d7326351.tar.bz2
2022-598a36466e76d0c7c16a690a72d4a0e8d7326351.zip
fixed merge conflicts
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions