From 71fabe7cf69d5d887c218cb0e609590d5e518829 Mon Sep 17 00:00:00 2001
From: Alexander Anderson <alexander.a.anderson@ieee.org>
Date: Mon, 24 May 2021 18:31:32 -0700
Subject: [PATCH] Initial rebuild

---
 docs/source/conf.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 38237df..8f87d40 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -34,10 +34,6 @@
 extensions = [
     'nbsphinx',
     'sphinx.ext.autodoc',
-<<<<<<< Updated upstream
-    # 'javasphinx',
-=======
->>>>>>> Stashed changes
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',