[Minios-devel] [UNIKRAFT PATCH] Fix broken user guide with malformed commit.

[Alexander Jung <a.jung@xxxxxxxxxxx>]

Signed-off-by: Alexander Jung <a.jung@xxxxxxxxxxx>
---
 doc/guides/users.rst | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/doc/guides/users.rst b/doc/guides/users.rst
index f95ad72..5d157bf 100644
--- a/doc/guides/users.rst
+++ b/doc/guides/users.rst
@@ -1,21 +1,5 @@
 ============
 User's Guide
-<<<<<<< Updated upstream
-####################
-This section of the guide provides all the information you should need
-to  get started  with and  to  use Unikraft.  If you  have never  used
-Unikraft  before, read  the getting  started page  and optionally  run
-through the tutorials.
-
-.. toctree::
-   :maxdepth: 2
-
-   users-gettingstarted
-   users-tutorial
-   users-downloads
-   users-resources
-=======
-============
 
 Unikraft is an extensive build system in addition to the core and external
 libraries which facilitate the underlying functionality of a unikernel.  
Details
@@ -29,4 +13,3 @@ how to use these leverage this functionality for advanced 
usage.
 
    kraft
    users-advanced
->>>>>>> Stashed changes
-- 
2.24.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel