From 817a673d7664159605040410b9412e2f9cd19474 Mon Sep 17 00:00:00 2001
From: Tero Frondelius <tero.frondelius@gmail.com>
Date: Sat, 6 Jun 2015 17:43:51 +0300
Subject: [PATCH 1/3] Nodes and Elements

---
 src/JuliaFEM.jl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index 04075f2..e35e655 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -1,6 +1,14 @@
+# This file is a part of JuliaFEM. License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
 module JuliaFEM
 
 # package code goes here
-test = 1
+type Node
+    node_id
+    coords
+end
+type Element
+    element_id
+    node_ids
+end
 
 end # module

From 75cb6e93d1732f734d935d5ce59c2f0b811350ed Mon Sep 17 00:00:00 2001
From: Tero Frondelius <tero.frondelius@gmail.com>
Date: Sat, 6 Jun 2015 17:48:02 +0300
Subject: [PATCH 2/3] Nodes and Elements corrected

---
 src/JuliaFEM.jl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index cc794e4..3c257cf 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -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

From a08fbc0e5ec6c52b1ae833479c238e5e254732d8 Mon Sep 17 00:00:00 2001
From: Tero Frondelius <tero.frondelius@gmail.com>
Date: Sat, 6 Jun 2015 17:49:14 +0300
Subject: [PATCH 3/3] Nodes and Elements corrected

---
 src/JuliaFEM.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index 3c257cf..6b2b004 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -9,7 +9,7 @@ end
 type Element
     element_id
     node_ids
-
+end
 function test()
     return 1
 end