Skip to content

Commit 5429e6b

Browse files
committed
rebase
1 parent 9f5cd4b commit 5429e6b

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

Project.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,9 @@ MultivariateStats = "0.9, 0.10"
3737
NaNMath = "1"
3838
Observables = "0.3 - 0.5"
3939
Plots = "1.29"
40-
<<<<<<< HEAD
4140
RecipesBase = "0.6, 1"
4241
RecipesPipeline = "0.2 - 0.6"
4342
Reexport = "0.2, 1"
44-
=======
45-
RecipesBase = "0.6, 0.7, 0.8, 1"
46-
RecipesPipeline = "0.1.6, 0.2, 0.3, 0.4, 0.5"
47-
Reexport = "0.2, 1.0"
48-
>>>>>>> 9fdc689 (refactor using structs)
4943
StatsAPI = "1.2"
5044
StatsBase = "0.32, 0.33"
5145
StatsModels = "0.6"

0 commit comments

Comments
 (0)