[GNUnet-SVN] [libmicrohttpd] branch master updated: Fixed merge errors in ChangeLog text

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 01ea7c78 Fixed merge errors in ChangeLog text
01ea7c78 is described below

commit 01ea7c780537abb714a4ec02a9d78a5502787046
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Mar 12 12:42:10 2017 +0300

    Fixed merge errors in ChangeLog text
---
 ChangeLog | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 476ec80e..6ea958f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-<<<<<<< HEAD
+Sat Mar 11 12:03:45 CET 2017
+       Fix largepost example from tutorial to properly generate
+       error pages. -CG
+       Fix largepost example, must only queue replies either before upload
+       happens or after upload is done, not while upload is ongoing
+
 Fri Mar 10 16:37:12 CET 2017
        Fix hypothetical integer overflow for very, very large
        timeout values. -CG
@@ -16,11 +21,6 @@ Tue Mar  7 10:37:45 BRT 2017
 
 Mon Mar  6 21:46:59 BRT 2017
        Added the i18n example fixing #4924. -SC
-=======
-Sat Mar 11 12:03:45 CET 2017
-       Fix largepost example from tutorial to properly generate
-       error pages. -CG
->>>>>>> 6334f1a7... fix largepost example, must only queue replies either 
before upload happens or after upload is done, not while upload is ongoing
 
 Thu Feb 16 11:20:05 CET 2017
        Replace tsearch configure check with code from gnulib. -CG

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