fix merge conflict

boost-R · Dec 4, 2017 · 00145b6 · 00145b6
1 parent 6af980e
commit 00145b6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -17,6 +17,7 @@ export(glmboostLSS,
        plot.glmboostLSS, plot.gamboostLSS,
        model.weights,
        PI, predint, plot.predint,
+       predict.mboostLSS,
        make.grid, cvrisk.mboostLSS, cvrisk.nc_mboostLSS,
        plot.cvriskLSS, plot.nc_cvriskLSS, 
        selected, selected.mboostLSS, selected.stabsel_mboostLSS,