Commit cfbc9781 authored by Topi Rasku's avatar Topi Rasku
Browse files

Removing a conflict notice I forgot to commit before merge.

parent 35d18b0b
......@@ -446,7 +446,6 @@ This avoids a discontinuity `jump' after the initial sample.
// Do smoothing
<<<<<<< HEAD
if(mSettings(mSolve, 'scenarios'), // Only do smooting if using long-term scenarios
// Select the initial sample, first `t` not in it and `f` of the last `t` in it
loop((ms_initial(mSolve, s_), t_, ft(f_, t__))
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