Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Mar 13, 2018
2 parents d86a3ae + a723e80 commit 6a0930e
Showing 5 changed files with 35 additions and 35 deletions.
10 changes: 5 additions & 5 deletions tests/testthat/out/hm.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-01:00
-00:01
00:00
00:01
01:00
-01:00
-00:01
00:00
00:01
01:00
NA
18 changes: 9 additions & 9 deletions tests/testthat/out/hms.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
-1000:00:00
- 01:00:00
- 00:01:00
- 00:00:01
 00:00:00
 00:00:01
 00:01:00
01:00:00
1000:00:00
-1000:00:00
- 01:00:00
- 00:01:00
- 00:00:01
00:00:00
00:00:01
00:01:00
01:00:00
1000:00:00
NA
18 changes: 9 additions & 9 deletions tests/testthat/out/hmss.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
-01:00:00.000
-00:01:00.000
-00:00:01.000
-00:00:00.001
00:00:00.000
00:00:00.001
00:00:01.000
00:01:00.000
01:00:00.000
-01:00:00.000
-00:01:00.000
-00:00:01.000
-00:00:00.001
00:00:00.000
00:00:00.001
00:00:01.000
00:01:00.000
01:00:00.000
NA
10 changes: 5 additions & 5 deletions tests/testthat/out/ms.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-01'00"
-00'01"
00'00"
00'01"
01'00"
-01'00"
-00'01"
00'00"
00'01"
01'00"
NA
14 changes: 7 additions & 7 deletions tests/testthat/out/mss.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
-01'00.000"
-00'01.000"
-00'00.001"
00'00.000"
00'00.001"
00'01.000"
01'00.000"
-01'00.000"
-00'01.000"
-00'00.001"
00'00.000"
00'00.001"
00'01.000"
01'00.000"
NA

0 comments on commit 6a0930e

Please # to comment.