summaryrefslogtreecommitdiff
path: root/doc/source/conf.py
diff options
context:
space:
mode:
authorGarret Fick <garret@ficksworkshop.com>2016-08-06 09:51:58 +0800
committerGarret Fick <garret@ficksworkshop.com>2016-08-06 09:51:58 +0800
commit8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410 (patch)
tree8415fede2e664716a5b3a09fbb4c09baca78bcf8 /doc/source/conf.py
parent8cd842a41a55ab3d8f558a2e3e198beba7da58a1 (diff)
downloadgerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.tar.gz
gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.tar.bz2
gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.zip
Fix multiple problems with the merge. There are still errors, but I will intentionally leave them because future merges might resolve them
Diffstat (limited to 'doc/source/conf.py')
0 files changed, 0 insertions, 0 deletions