conf.py: resolve merge conflict

This commit is contained in:
Robert Göhler 2020-01-04 12:56:19 +01:00
parent d2159df647
commit 5b3160976a

View File

@ -176,5 +176,3 @@ texinfo_documents = [
def setup(app): def setup(app):
pass pass
#app.add_object_type('opcmd', 'opcmd')
#app.add_object_type('cfgcmd', 'cfgcmd')