Remove git merge conflict cruft

jiahao · jiahao · commit bf3bbb11850f · 2016-05-13T12:14:54.000-04:00
(cc @dlfivefifty)
diff --git a/src/InvariantEnsembles.jl b/src/InvariantEnsembles.jl
@@ -204,7 +204,6 @@ function iekernel(q::Array{Float64,2},d,plan::Function)
 end
 
 
-<<<<<<< 16c414b28d81a04c589c8ec5e66aa724f4e110f0
 samplespectra(str::AbstractString,n::Integer,m::Integer)=samplespectra(InvariantEnsemble(str,n),m)
 
 

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,6 @@ function iekernel(q::Array{Float64,2},d,plan::Function)`
`204`	`204`	`end`
`205`	`205`
`206`	`206`
`207`		`-<<<<<<< 16c414b28d81a04c589c8ec5e66aa724f4e110f0`
`208`	`207`	`samplespectra(str::AbstractString,n::Integer,m::Integer)=samplespectra(InvariantEnsemble(str,n),m)`
`209`	`208`
`210`	`209`