mirror of
https://github.com/JuliaFEM/JuliaFEM.jl.git
synced 2026-09-10 13:17:42 +00:00
Update JuliaFEM.jl
Removed <<< head signature
This commit is contained in:
+1
-3
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user