summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2021-11-20 14:57:27 +0000
committerdavidovski <david@davidovski.xyz>2021-11-20 14:57:27 +0000
commitbd8d23136d343e1465e0222f6030fea1cbd4cbf3 (patch)
tree8201eb5dfa3e5d186de539c9d8082d207130598f /Makefile
parent2e6bf4724ee2bd9844a8e3d411d95c066148f51b (diff)
parent28029bc25090e706d08b6c5735bb5dfc24176f59 (diff)
resolved conflicts
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions