From 359060a151998c5ab08e54af1420b7406005dc6b Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <lsm@cesanta.com>
Date: Tue, 11 Feb 2020 12:11:10 +0000
Subject: [PATCH] mongoose.h 6.17

---
 mongoose.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mongoose.h b/mongoose.h
index c552b25289..f768c8d93f 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -23,11 +23,7 @@
 #ifndef CS_MONGOOSE_SRC_COMMON_H_
 #define CS_MONGOOSE_SRC_COMMON_H_
 
-<<<<<<< HEAD
-#define MG_VERSION "6.16"
-=======
 #define MG_VERSION "6.17"
->>>>>>> origin/dev
 
 /* Local tweaks, applied before any of Mongoose's own headers. */
 #ifdef MG_LOCALS