mongoose.h 6.17

359060a1 · Sergey Lyubka · af1aff7f · 359060a1
Commit 359060a1 authored Feb 11, 2020 by Sergey Lyubka
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

mongoose.h mongoose.h +0 -4

No files found.
--- 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