own fault in aba reader ver.2

This commit is contained in:
ovainola
2015-06-25 21:08:42 +03:00
parent 54e577f823
commit bfde673714
-2
View File
@@ -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