makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/controller] Resolve trivial conflict I missed during rebase

Browse source 
PHPBB3-10864
This commit is contained in:
David King 2012-11-12 15:48:53 -05:00
parent dd1f8a0e55
commit 6e647cf6e1
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/config/services.yml
View file

@ -113,8 +113,6 @@ services:
- %core.root_path% - %core.root_path%
- .%core.php_ext% - .%core.php_ext%
- @cache.driver - @cache.driver
<<<<<<< HEAD
=======
ext.finder: ext.finder:
class: phpbb_extension_finder class: phpbb_extension_finder
@ -138,7 +136,6 @@ services:
- @user - @user
tags: tags:
- { name: kernel.event_subscriber } - { name: kernel.event_subscriber }
>>>>>>> 719171f... [feature/controller] Implement a front controller
request: request:
class: phpbb_request class: phpbb_request