Nodes and Elements corrected

2026-09-19 09:54:55 +00:00 · 2015-06-06 17:48:02 +03:00
parent 91306de29a
commit d7451d0999
1 changed files with 1 additions and 3 deletions
@@ -2,7 +2,6 @@
 module JuliaFEM

 # package code goes here
-<<<<<<< HEAD
 type Node
    node_id
    coords
@@ -10,10 +9,9 @@ end
 type Element
    element_id
    node_ids
-=======
+
 function test()
    return 1
->>>>>>> 449851216b54d7b731c51df489af594afed19821
 end

 end # module