From 67f06be61e95b2d1811ed27e6af97e832f3435e9 Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Wed, 19 Jun 2019 16:05:37 +0200
Subject: [PATCH] fixes merging artifacts from #15383

---
 fid_bbi/config/vufind/{finc-fid-core-api.ini => fid.ini} | 0
 themes/fid_bbi/theme.config.php                          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename fid_bbi/config/vufind/{finc-fid-core-api.ini => fid.ini} (100%)

diff --git a/fid_bbi/config/vufind/finc-fid-core-api.ini b/fid_bbi/config/vufind/fid.ini
similarity index 100%
rename from fid_bbi/config/vufind/finc-fid-core-api.ini
rename to fid_bbi/config/vufind/fid.ini
diff --git a/themes/fid_bbi/theme.config.php b/themes/fid_bbi/theme.config.php
index e501e8307ce..1c983fd3140 100644
--- a/themes/fid_bbi/theme.config.php
+++ b/themes/fid_bbi/theme.config.php
@@ -1,6 +1,6 @@
 <?php
 return [
-    'extends' => 'finc-fid',
+    'extends' => 'fid',
     //'favicon' => 'favicon.ico',
     'helpers' => array(
         'factories' => array(
-- 
GitLab