Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 7cf988640ea7 · 2020-10-13T14:46:35.000+02:00
* 4.4:
  Fix merge
diff --git a/composer.json b/composer.json
@@ -46,12 +46,5 @@
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
-<<<<<<< HEAD
-    },
-    "extra": {
-        "branch-version": "5.1-dev"
-    }
-=======
     }
->>>>>>> 4.4
 }

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,5 @@`
`46`	`46`	`"name": "phpunit/phpunit",`
`47`	`47`	`"url": "https://github.com/sebastianbergmann/phpunit"`
`48`	`48`	`}`
`49`		`-<<<<<<< HEAD`
`50`		`- },`
`51`		`- "extra": {`
`52`		`- "branch-version": "5.1-dev"`
`53`		`- }`
`54`		`-=======`
`55`	`49`	`}`
`56`		`->>>>>>> 4.4`
`57`	`50`	`}`