TastyPancakes/Flux.jl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Tejan Karmali 2018-11-28 11:07:43 -05:00
parent bc9bda9a85
commit 89f2709b61
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/layers/conv.jl
View File

@ -51,7 +51,6 @@ function Base.show(io::IO, l::Conv)
print(io, ")")
end
<<<<<<< HEAD
(a::Conv{<:Any,<:Any,W})(x::AbstractArray{T}) where {T <: Union{Float32,Float64}, W <: AbstractArray{T}} =
invoke(a, Tuple{AbstractArray}, x)