aboutsummaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2018-10-01 14:38:32 +0200
committerRobert Alessi <alessi@robertalessi.net>2018-10-01 14:38:32 +0200
commita8382bef1137282b73746284ee16ea0228f492be (patch)
treebb1b2a94e3a2215c815d45cbcfcd25c88965de50 /makefile
parent645fb1f4ce14786b70f2d9a3446b8fa407b4ea0f (diff)
downloadarabluatex-a8382bef1137282b73746284ee16ea0228f492be.tar.gz
fixed conflict between origin and master
Diffstat (limited to 'makefile')
0 files changed, 0 insertions, 0 deletions