Skip to content

N
node-bigstream
Commit be36b036 authored by project's avatar project
Browse files
Options

--no commit message 

--no commit message
parent 3f045e66
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
test/jobs/agritronics.json
View file @ be36b036
......@@ -3,7 +3,13 @@
"active" : true,
"trigger" : {
"type": "cron",
<<<<<<< .mine
"cmd": "10 * * * *"
||||||| .r931
"cmd": "* */10 * * *"
=======
"cmd": "15,45 * * * *"
>>>>>>> .r976
},
"data_in" : {
"type": "agritronics",
......@@ -28,8 +34,16 @@
{"type": "2021", "node_id": "7328"},
{"type": "2022", "node_id": "7328"}
],
<<<<<<< .mine
"init_observed_date": "2017-03-10",
"init_observed_time": "00:00:00"
||||||| .r931
"init_observed_date": "2017-02-05",
"init_observed_time": "11:30:00"
=======
"init_observed_date": "2017-02-05",
"init_observed_time": "12:00:00"
>>>>>>> .r976
}
},
"data_transform" : {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment