We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 5a0027a commit 6291133Copy full SHA for 6291133
src/slopes.jl
@@ -118,7 +118,11 @@ function ^(u::Slope, k::Integer)
118
h1 = interval((hxs.lo - hc.hi) / s, (hxi.lo - hc.hi) / i)
119
end
120
121
+<<<<<<< 5a0027a5e8291888d4cdb02568ab5e0a12eaeafc
122
return Slope(hx, hc, h1 * u.s)
123
+=======
124
+ return Slope{Float64}(hx, hc, h1 * u.s)
125
+>>>>>>> Incorporate review comments
126
127
128
0 commit comments