aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/config/services.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 650869d1e6..54d347debe 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -113,8 +113,6 @@ services:
- %core.root_path%
- .%core.php_ext%
- @cache.driver
-<<<<<<< HEAD
-=======
ext.finder:
class: phpbb_extension_finder
@@ -138,7 +136,6 @@ services:
- @user
tags:
- { name: kernel.event_subscriber }
->>>>>>> 719171f... [feature/controller] Implement a front controller
request:
class: phpbb_request