resolve merge conflict in setup/index.rst

ClarityNLP · Jul 1, 2019 · f138550 · f138550
2 parents b53d015 + 87932ef
commit f138550
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/docs/setup/index.rst b/docs/setup/index.rst
@@ -2,32 +2,25 @@ Setup
 =====
 The following guides will get you started with ClarityNLP.
 
-Single-User Setup with Docker
------------------------------
+Local Setup
+-----------
+
 
 .. toctree::
    :maxdepth: 2
 
    local-docker
 
-Single-User Setup without Docker (Bare Bones)
----------------------------------------------
-
-.. toctree::
-   :maxdepth: 3
-
-   bare-bones-setup
+Production Setup
+----------------
 
-
-Multi-User (Production) Setup
------------------------------
 
 .. toctree::
    :maxdepth: 2
 
    production-docker
-      
-   
+
+
 Accessing ClarityNLP Securely
 -----------------------------
 The following section is useful if you need to interact directly with the ClarityNLP API via a HTTP client or a third-party app.
@@ -37,7 +30,8 @@ The following section is useful if you need to interact directly with the Clarit
 
    retrieve-access-token
    add-third-party-app
-
+
+
 
 Data Ingestion
 --------------