diff --git a/Project.toml b/Project.toml index ee0fe77..189d088 100644 --- a/Project.toml +++ b/Project.toml @@ -37,15 +37,9 @@ MultivariateStats = "0.9, 0.10" NaNMath = "1" Observables = "0.3 - 0.5" Plots = "1.29" -<<<<<<< HEAD RecipesBase = "0.6, 1" RecipesPipeline = "0.2 - 0.6" Reexport = "0.2, 1" -======= -RecipesBase = "0.6, 0.7, 0.8, 1" -RecipesPipeline = "0.1.6, 0.2, 0.3, 0.4, 0.5" -Reexport = "0.2, 1.0" ->>>>>>> 9fdc689 (refactor using structs) StatsAPI = "1.2" StatsBase = "0.32, 0.33" StatsModels = "0.6"