Update JuliaFEM.jl

Removed <<< head signature
This commit is contained in:
ovainola
2015-09-01 22:53:03 +03:00
parent 6f09e15921
commit 0b144a9af4
+1 -3
View File
@@ -17,10 +17,8 @@ include("xdmf.jl")
include("abaqus_reader.jl")
include("interfaces.jl")
<<<<<<< HEAD
export set_coordinates, get_coordinates #, set_material
=======
#export set_coordinates, get_coordinates, set_material
>>>>>>> 18394347dd9874ca301e7612fc776ccab08f4601
end # module