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

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

diff --git a/src/abaqus_reader.jl b/src/abaqus_reader.jl
index 749b6a9..480bade 100644
--- a/src/abaqus_reader.jl
+++ b/src/abaqus_reader.jl
@@ -14,7 +14,7 @@ VERSION < v"0.4-" && using Docile
 eldims = Dict("C3D10" => 10)
 global handlers = Dict()
 
-<<<<<<< HEAD
+
 @doc """
 Register new handler for parser
 """ ->