diff options
| author | David King <imkingdavid@gmail.com> | 2012-11-12 15:48:53 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-11-16 16:45:27 -0500 |
| commit | 6e647cf6e142da3ddf304275803e708501daeb82 (patch) | |
| tree | e8c2f1c823bab87aa8379190a2e16e4700d53cd4 /phpBB | |
| parent | dd1f8a0e554cc7c7fd975089cfd01acc88c656a6 (diff) | |
| download | forums-6e647cf6e142da3ddf304275803e708501daeb82.tar forums-6e647cf6e142da3ddf304275803e708501daeb82.tar.gz forums-6e647cf6e142da3ddf304275803e708501daeb82.tar.bz2 forums-6e647cf6e142da3ddf304275803e708501daeb82.tar.xz forums-6e647cf6e142da3ddf304275803e708501daeb82.zip | |
[feature/controller] Resolve trivial conflict I missed during rebase
PHPBB3-10864
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/config/services.yml | 3 |
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 |