Skip to content

Commit a05385c

Browse files
lsteinmannlsteinmann
committed
fixed merge conflict (oops)
1 parent 7227c51 commit a05385c

8 files changed

Lines changed: 297 additions & 304 deletions

File tree

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Description: Converting date ranges into dating 'steps' eases the visualization
88
License: CC BY-SA 4.0
99
Encoding: UTF-8
1010
LazyData: true
11-
RoxygenNote: 7.0.2
11+
RoxygenNote: 7.1.0

‎NAMESPACE‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Generated by roxygen2: do not edit by hand
2-
3-
export(create.sub.objects)
4-
export(datsteps)
5-
export(get.weights)
6-
export(scaleweight)
7-
export(switch.dating)
1+
# Generated by roxygen2: do not edit by hand
2+
3+
export(create.sub.objects)
4+
export(datsteps)
5+
export(get.weights)
6+
export(scaleweight)
7+
export(switch.dating)

0 commit comments

Comments
 (0)