diff options
Diffstat (limited to 'storage/connect/json.h')
| -rw-r--r-- | storage/connect/json.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/connect/json.h b/storage/connect/json.h index e08846149a3..da45157f124 100644 --- a/storage/connect/json.h +++ b/storage/connect/json.h @@ -267,7 +267,4 @@ class JVALUE : public JSON { PJVAL Next; // Next value in array bool Del; // True when deleted }; // end of class JVALUE -<<<<<<< HEAD -======= ->>>>>>> ob-10.1 |