Skip to content

Commit 2949cd0

Browse files
committed
Merge branch 'master' of github.com:ronaldyang/parse-embedded-sdks
Conflicts: yun/libraries/Parse/examples/test/Test.ino
2 parents a870174 + 541265b commit 2949cd0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

examples/test/Temperature.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"createdAt": "2015-03-23T23:28:35.710Z",
1414
"leverDown": true,
1515
"objectId": "I4S0FgSeqT",
16-
"s": "1",
16+
"stringField": "1",
1717
"score": 3,
1818
"temperature": 88,
1919
"updatedAt": "2015-03-25T01:35:56.238Z"
@@ -27,7 +27,7 @@
2727
"createdAt": "2015-03-23T22:53:50.156Z",
2828
"leverDown": false,
2929
"objectId": "E9A7EhqHTT",
30-
"s": "1",
30+
"stringField": "1",
3131
"score": 4,
3232
"temperature": 10,
3333
"updatedAt": "2015-03-24T08:15:37.573Z"
@@ -42,7 +42,7 @@
4242
"createdAt": "2015-03-23T16:40:25.288Z",
4343
"leverDown": true,
4444
"objectId": "EFi7f7M9KU",
45-
"s": "foo",
45+
"stringField": "foo",
4646
"score": 5,
4747
"temperature": 88,
4848
"updatedAt": "2015-03-25T01:36:46.318Z"
@@ -51,23 +51,23 @@
5151
"ACL": {},
5252
"createdAt": "2015-03-24T08:03:59.537Z",
5353
"objectId": "Kb7PBSVth3",
54-
"s": "2",
54+
"stringField": "2",
5555
"temperature": 4,
5656
"updatedAt": "2015-03-25T01:12:29.181Z"
5757
},
5858
{
5959
"ACL": {},
6060
"createdAt": "2015-03-24T08:03:53.470Z",
6161
"objectId": "vfJRozV2u6",
62-
"s": "1",
62+
"stringField": "1",
6363
"temperature": 5,
6464
"updatedAt": "2015-03-25T01:12:25.602Z"
6565
},
6666
{
6767
"ACL": {},
6868
"createdAt": "2015-03-24T07:10:44.586Z",
6969
"objectId": "69HYdAk1tj",
70-
"s": "1",
70+
"stringField": "1",
7171
"temperature": 6,
7272
"updatedAt": "2015-03-25T01:12:21.840Z"
7373
},
@@ -83,7 +83,7 @@
8383
},
8484
"createdAt": "2015-03-24T00:11:05.908Z",
8585
"objectId": "qWEoK5NrGq",
86-
"s": "1",
86+
"stringField": "1",
8787
"score": 1,
8888
"temperature": 100,
8989
"updatedAt": "2015-03-24T09:35:24.376Z"
@@ -100,9 +100,9 @@
100100
},
101101
"createdAt": "2015-03-24T00:08:37.847Z",
102102
"objectId": "bjb0EZaoFr",
103-
"s": "1",
103+
"stringField": "1",
104104
"score": 2,
105105
"temperature": 999,
106106
"updatedAt": "2015-03-25T01:22:14.616Z"
107107
}
108-
] }
108+
] }

0 commit comments

Comments
 (0)