From 7482f073ae8677e7fcfd2bb60087bd76dfc8a8d9 Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat, 6 Jun 2015 19:23:06 +0200
Subject: Commit od last modifications made for version 10.0

---
 storage/connect/json.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'storage/connect/json.cpp')

diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index 315904f2b05..3d03bea5d00 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -23,11 +23,7 @@
 
 #define ARGS       MY_MIN(24,len-i),s+MY_MAX(i-3,0)
 
-<<<<<<< HEAD
 #if defined(__WIN__)
-=======
-#if defined(WIN32)
->>>>>>> ob-10.1
 #define EL  "\r\n"
 #else
 #define EL  "\n"
@@ -1163,7 +1159,4 @@ bool JVALUE::IsNull(void)
 {
   return (Jsp) ? Jsp->IsNull() : (Value) ? Value->IsZero() : true;
 } // end of IsNull
-<<<<<<< HEAD
 
-=======
->>>>>>> ob-10.1
-- 
cgit v1.2.1