Commit 0069b11f authored by arsenij.ustjanzew's avatar arsenij.ustjanzew
Browse files

resolved merge conflict

parent 44c6b64b
......@@ -2,10 +2,6 @@
export("%<>%")
export("%>%")
<<<<<<< HEAD
=======
export(.bar_plot)
>>>>>>> new_boxplot_2
export(.scatter_plot)
export(barplot)
export(boxplot)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment