From 921bd1777038834439e095e77df25d9f4ae64a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Tue, 14 Sep 2021 15:09:24 +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 e69de29b..4675d34d 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 @@ -0,0 +1 @@ +@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts/*'