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

---
 global.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'global.mk')

diff --git a/global.mk b/global.mk
index 79cedc9..c301a88 100644
--- a/global.mk
+++ b/global.mk
@@ -72,7 +72,7 @@ SUBDIRS         := src/boundary \
                    src/communication \
                    src/dynamics \
                    src/contrib \
-                   src/contrib/functors \
+                   src/contrib/refinement \
                    src/core \
                    src/geometry \
                    src/external/tinyxml \
-- 
cgit v1.2.3