From f31cb89065072986a48dd5b1156021b8bbe7eb78 Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Fri, 8 Sep 2017 12:25:32 +0200
Subject: [PATCH] Fixed merge conflict.

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f778d633..d6df654a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,4 @@
 log_*
 log.*
 *~
-<<<<<<< HEAD
-
-linux64Gcc*
-lnInclude
-=======
 **/linux64GccDPInt32Opt
->>>>>>> b8921ec6ca10719a4aa4990fcbaf730076fb67fd