aboutsummaryrefslogtreecommitdiff
path: root/_includes/head.html
diff options
context:
space:
mode:
authorNoah Loomans <noahloomans@gmail.com>2018-05-19 13:15:01 +0200
committerNoah Loomans <noahloomans@gmail.com>2018-05-19 13:15:01 +0200
commite66d9028feb5245aeff463a1c9f3fb2060d224dd (patch)
treeea1dac1479b6743999a538936825105099f5c98c /_includes/head.html
parentd2e54a7b8e6bd725587409df138111bab0c103e4 (diff)
Actually fix merge conflict...
Diffstat (limited to '_includes/head.html')
0 files changed, 0 insertions, 0 deletions