diff options
| author | Zachary Ferguson <zfergus2@users.noreply.github.com> | 2015-10-06 18:19:20 -0400 |
|---|---|---|
| committer | Zachary Ferguson <zfergus2@users.noreply.github.com> | 2015-10-06 18:19:20 -0400 |
| commit | c4f93c0b0ec1fcea11e336b67929b9d6f426765c (patch) | |
| tree | a97e9f7a56330e45122bb81bb5194f2aefe03fdb /json.html.markdown | |
| parent | 29cbff176857653422555650c983afef4a28ae1f (diff) | |
| parent | 55c80f255202b03c4c3a66ac1d37f880a3782b68 (diff) | |
Merge remote-tracking branch 'adambard/master'
Conflicts:
java.html.markdown
Diffstat (limited to 'json.html.markdown')
| -rw-r--r-- | json.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/json.html.markdown b/json.html.markdown index f57b82b8..47a8cb21 100644 --- a/json.html.markdown +++ b/json.html.markdown @@ -49,7 +49,7 @@ going to be 100% valid JSON. Luckily, it kind of speaks for itself. "alternative style": { "comment": "check this out!" - , "comma position": "doesn't matter - as long as its before the value, then its valid" + , "comma position": "doesn't matter - as long as it's before the value, then it's valid" , "another comment": "how nice" }, |