Updated LorenzTest.jl in 2.1.0 branch

StanJulia · Sep 5, 2017 · 9c0c6fc · 9c0c6fc
1 parent ec8f794
commit 9c0c6fc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Examples/OtherExamples/DiffEqBayes/Lorenz/LorenzTest.jl b/Examples/OtherExamples/DiffEqBayes/Lorenz/LorenzTest.jl
@@ -51,8 +51,4 @@ cd(ProjDir) do
 
   @test mean(theta1.value[:,:,1]) ≈ 2.6666 atol=1e-1
 
-<<<<<<< HEAD
-#end
-=======
 end
->>>>>>> master