some final changes

FluxML · Nov 9, 2018 · 568658c · 568658c
1 parent b64bd5a
commit 568658c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/test/tracker.jl b/test/tracker.jl
@@ -186,13 +186,10 @@ end
 @test gradtest(conv, rand(10, 10, 3, 2), randn(Float64,2, 2, 3, 2))
 @test gradtest(conv, rand(10, 10, 10, 3, 2), randn(Float64,2, 2, 2, 3, 2))
 
-<<<<<<< HEAD
 @test gradtest(crosscor, rand(10, 3, 2), randn(Float64,2, 3, 2))
 @test gradtest(crosscor, rand(10, 10, 3, 2), randn(Float64,2, 2, 3, 2))
 @test gradtest(crosscor, rand(10, 10, 10, 3, 2), randn(Float64,2, 2, 2, 3, 2))
-=======
 @test gradtest(depthwiseconv, rand(10,10,3,2), randn(2, 2, 2, 3))
->>>>>>> 30486f9c0394304649bbc6121bd391ef066966c3
 
 @test gradtest(x -> maxpool(x, (2,2)), rand(10, 10, 3, 2))
 @test gradtest(x -> maxpool(x, (2,2,2)), rand(10, 10, 10, 3, 2))