resolve conflict

Merge branch 'master' of https://github.com/ampatzia/pasaR # Conflicts: # R/main.R
ampatzia · Aug 21, 2017 · 92ffbe3 · 92ffbe3
2 parents 469e882 + 3f3067c
commit 92ffbe3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
+export(bac_stre)
+export(bac_stre_names)
 export(cluster_number)
 export(cp_plot)
 export(gp_plot)