remove leftover line from merge

JuliaDSP · Jan 9, 2020 · 66b187a · 66b187a
1 parent 86e6938
commit 66b187a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/dspbase.jl b/src/dspbase.jl
@@ -255,7 +255,6 @@ array.
 function _zeropad_keep_offset(u, padded_size, args...)
     _zeropad_keep_offset(u, padded_size, axes(u), args...)
 end
->>>>>>> master
 
 """
 Estimate the number of floating point multiplications per output sample for an