Fix conflicts

cchengubnt · Sep 17, 2018 · 64c369c · 64c369c
2 parents 5ee61cb + c52ef86
commit 64c369c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ Path syntax
 -----------
 
 A path is a series of keys separated by a dot.
-The dot and colon characters can be escaped with '\\'.
+The dot and colon characters can be escaped with ``\``.
 
 ```json
 {

diff --git a/sjson_test.go b/sjson_test.go
@@ -121,6 +121,10 @@ func TestBasic(t *testing.T) {
 		`{":\1":{"this":[null,null,null,null,{".HI":4}]}}`,
 		``,
 		"\\:\\\\1.this.4.\\.HI", `4`)
+	testRaw(t, setRaw,
+		`{"app.token":"cde"}`,
+		`{"app.token":"abc"}`,
+		"app\\.token", `"cde"`)
 	testRaw(t, setRaw,
 		`{"b":{"this":{"😇":""}}}`,
 		``,
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ Path syntax @@
     -----------
     A path is a series of keys separated by a dot.
-    The dot and colon characters can be escaped with '\\'.
+    The dot and colon characters can be escaped with ``\``.
     ```json
     {
@@ Expand Down @@