fix leftover of conflict

HenriDeh · Apr 11, 2022 · 5cf1401 · 5cf1401
1 parent 834d1a2
commit 5cf1401
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/zoo.jl b/src/zoo.jl
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-function sl_sip(h, b, K, CV, c, μ::Vector, start_inventory, LT::Int = 0; lostsales = false, horizon = length(μ)÷2, policy = sSPolicy(), periods = length(μ) - horizon)
-=======
 function sl_sip(h, b, K, CV, c, μ::Vector, start_inventory, LT::Int = 0; lostsales = false, horizon = length(μ), policy = sSPolicy(), periods = horizon)
->>>>>>> 46e69d4 (fix tests and zoo)
     item = EndProduct(
         Market(b, CVNormal{CV}, horizon, 0, μ, lostsales = lostsales),
         Inventory(h, start_inventory),