mirror/ultrajson
1
0
Fork 0
mirror of https://github.com/ultrajson/ultrajson.git synced 2024-11-23 12:32:02 +01:00
Code Issues

Removed a left-over from conflict resolution.

Browse Source
This commit is contained in:
Joakim Hamren 2015-11-30 11:58:32 +01:00
parent ea0ab37750
commit 0c52200eb4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ultrajson.h
View File

@ -245,7 +245,6 @@ typedef struct __JSONObjectEncoder
int encodeHTMLChars;
/*
<<<<<<< HEAD
If true, '/' will be encoded as \/. If false, no escaping. */
int escapeForwardSlashes;