Merge pull request phpro#341 from veewee/patch-git-conflict

Add correct configuration for the git conflict task

Author: veewee

resources/config/tasks.yml

@@ -127,6 +127,8 @@ services:
         class: GrumPHP\Task\Git\Conflict
         arguments:
             - '@config'
+            - '@process_builder'
+            - '@formatter.raw_process'
         tags:
             - {name: grumphp.task, config: git_conflict}