[GNUnet-SVN] [gnunet-rest-api] branch master updated: fixed merge conflict

[gnunet]

This is an automated email from the git hooks/post-receive script.

pagkopoulou pushed a commit to branch master
in repository gnunet-rest-api.

The following commit(s) were added to refs/heads/master by this push:
     new 52fa150  fixed merge conflict
52fa150 is described below

commit 52fa150c4cc7ccf9d59496a8ee445a9df1422a85
Author: Alexia Pagkopoulou <address@hidden>
AuthorDate: Tue Aug 20 13:19:22 2019 +0200

    fixed merge conflict
---
 source/config.rst | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/source/config.rst b/source/config.rst
index 2dbf86e..a45e2cd 100644
--- a/source/config.rst
+++ b/source/config.rst
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 Configuration
 =============
-=======
-Config API Service
-==================
->>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
 
 Definition
 ~~~~~~~~~~
@@ -89,13 +84,8 @@ GET Requests
 
+--------------------+---------------------------------------------------------------+
 
 
-<<<<<<< HEAD
 POST Requests
 -------------
-=======
-POST Request
-------------
->>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
 
 
+--------------------+---------------------------------------------------------------+
 |**Title**           | Creates/modifies options in the config                  
      |
@@ -113,7 +103,6 @@ POST Request
 |**Error Response**  | | {"error":"*error_desc*"}                              
      |
 
+--------------------+---------------------------------------------------------------+
 
-<<<<<<< HEAD
 |
 
 
+--------------------+---------------------------------------------------------------+
@@ -132,8 +121,6 @@ POST Request
 |**Error Response**  | | {"error":"*error_desc*"}                              
      |
 
+--------------------+---------------------------------------------------------------+
 
-=======
->>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
 
 OPTIONS Request
 ---------------

-- 
To stop receiving notification emails like this one, please contact
address@hidden.