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

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Hi Alexander,

as discussed offline, I am going to reject this commit because your 
other commit "[UNIKRAFT PATCH v2] Re-organize advanced user's guide into 
a single tutrial." includes the same changes.
Thanks,

Simon

On 02.02.20 10:28, Alexander Jung wrote:
> 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
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel