mongoose.h 6.17

cesanta · Feb 11, 2020 · 359060a · 359060a
1 parent af1aff7
commit 359060a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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