diff options
| author | Robert Göhler <github@ghlr.de> | 2020-01-04 12:56:19 +0100 |
|---|---|---|
| committer | Robert Göhler <github@ghlr.de> | 2020-01-04 12:56:19 +0100 |
| commit | 5b3160976a84eb019b1107dbbcb17cd746eeec40 (patch) | |
| tree | 5fdebbc304dfa071617f2576479018092e78211f /docs/conf.py | |
| parent | d2159df64738df01474b248f572c23b735d9ed0e (diff) | |
| download | vyos-documentation-5b3160976a84eb019b1107dbbcb17cd746eeec40.tar.gz vyos-documentation-5b3160976a84eb019b1107dbbcb17cd746eeec40.zip | |
conf.py: resolve merge conflict
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index b5e67368..09b7a958 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -176,5 +176,3 @@ texinfo_documents = [ def setup(app): pass - #app.add_object_type('opcmd', 'opcmd') - #app.add_object_type('cfgcmd', 'cfgcmd') |