From fe53746d1839c2cc756d7c01145594020367fbf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Wed, 8 Sep 2021 08:10:59 +0200 Subject: [PATCH] Fix failed merge-conflict resolution --- .../TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig index 8b137891..44b50b55 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig +++ b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig @@ -1 +1,2 @@ +@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts/*'