[ticket/12684] Fix merge errors

PHPBB3-12684
2025-07-31 14:00:31 +02:00 · 2016-02-29 08:28:37 -08:00
parent 8f7aba6582
commit d17a8ab523
2 changed files with 15 additions and 0 deletions
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -175,6 +175,16 @@ services:
        tags:
            - { name: console.command }

+    console.command.user.add:
+        class: phpbb\console\command\user\add
+        arguments:
+            - '@user'
+            - '@dbal.conn'
+            - '@config'
+            - '@passwords.manager'
+        tags:
+            - { name: console.command }
+
    console.command.reparser.list:
        class: phpbb\console\command\reparser\list_all
        arguments: