From 5b3160976a84eb019b1107dbbcb17cd746eeec40 Mon Sep 17 00:00:00 2001
From: Robert Göhler <github@ghlr.de>
Date: Sat, 4 Jan 2020 12:56:19 +0100
Subject: conf.py: resolve merge conflict

---
 docs/conf.py | 2 --
 1 file changed, 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')
-- 
cgit v1.2.3