summarylogtreecommitdiffstats
path: root/substance-designer
diff options
context:
space:
mode:
authort-ask2020-02-19 14:58:30 +0100
committert-ask2020-02-19 14:58:30 +0100
commit836e5efa63aece33ca6a3280d1e2e87521621b42 (patch)
treeb20a9985c7497cf422a65a4424ed37b5ee2d249d /substance-designer
parentdd1faa6a02b03505f07590e5f9f96d54394cbded (diff)
parent0fc27b16760674840c8092911263cf2cc924d9ec (diff)
downloadaur-836e5efa63aece33ca6a3280d1e2e87521621b42.tar.gz
Fix merge conflict
Diffstat (limited to 'substance-designer')
0 files changed, 0 insertions, 0 deletions