From bfde673714d223dbcf2cc7d12204dc63058b10bb Mon Sep 17 00:00:00 2001
From: ovainola <olli.vainola@student.oulu.fi>
Date: Thu, 25 Jun 2015 21:08:42 +0300
Subject: [PATCH] own fault in aba reader ver.2

---
 src/abaqus_reader.jl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/abaqus_reader.jl b/src/abaqus_reader.jl
index 480bade..e02523a 100644
--- a/src/abaqus_reader.jl
+++ b/src/abaqus_reader.jl
@@ -1,9 +1,7 @@
-<<<<<<< HEAD
 # This file is a part of JuliaFEM. 
 # License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
 =======
 # This file is a part of JuliaFEM. License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
->>>>>>> 3e48ae32abe7a17af89cd1e23d798532aed2960a
 module abaqus_reader
 
 using Logging