From 1477bbe177da4d3ad07877d4b672aac4828d0a13 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Mon, 24 Jun 2019 15:49:04 +0200
Subject: Fix rebase conflicts

---
 config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config.mk')

diff --git a/config.mk b/config.mk
index 651ab47..7283f41 100644
--- a/config.mk
+++ b/config.mk
@@ -58,7 +58,7 @@ PARALLEL_MODE   := OFF
 MPIFLAGS        :=
 OMPFLAGS        := -fopenmp
 
-BUILDTYPE       := precompiled
-#BUILDTYPE       := generic
+#BUILDTYPE       := precompiled
+BUILDTYPE       := generic
 
 FEATURES        :=
-- 
cgit v1.2.3