Skip to content

Commit 53425e8

Browse files
authored
Merge pull request #27 from kenmawer/km-issue_22_v3
Fixed butchered NAMESPACE.
2 parents fce1153 + 3326893 commit 53425e8

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

NAMESPACE

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ export(smooth_arx_args_list)
2626
export(smooth_arx_forecaster)
2727
export(step_epi_ahead)
2828
export(step_epi_lag)
29-
<<<<<<< HEAD
30-
export(step_narm)
31-
=======
3229
export(step_epi_naomit)
33-
export(step_epi_shift)
34-
>>>>>>> 878eb71132d58400f79ffdd6eb14452f289cbf6a
3530
import(recipes)
3631
importFrom(magrittr,"%>%")
3732
importFrom(rlang,"!!")

0 commit comments

Comments
 (0)