diff options
author | alexbiehl <alex.biehl@gmail.com> | 2017-10-08 20:18:46 +0200 |
---|---|---|
committer | alexbiehl <alex.biehl@gmail.com> | 2017-10-08 20:18:46 +0200 |
commit | 1d34ec9dfe1a9a0a4b7f6d8361adf58ec1a421ae (patch) | |
tree | 0d95aa3a1785774a224956b2f701d02cd2099f60 /doc/conf.py | |
parent | 671b62d104751fd0ab8daf6b9cda1b971abf331f (diff) |
Fix merge fallout
Diffstat (limited to 'doc/conf.py')
0 files changed, 0 insertions, 0 deletions