Commitcba307c

committed

Merge branch '2.7' into 2.8

* 2.7: Fixing bad conflict fix

2 parentscf17c2c +0d71b6c commitcba307cCopy full SHA for cba307c

File tree

-10

lines changed

-10

lines changed

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,19 +51,9 @@ Active Core Members`
`51`	`51`	* Romain Neutron (`romainneutron`_) can merge into the
`52`	`52`	`Process_ component;`
`53`	`53`
`54`		`-<<<<<<< HEAD`
`55`		- * Nicolas Grekas (`nicolas-grekas`_) can merge into theDebug_
`56`		`- component, theVarDumper_ component and theDebugBundle_;`
`57`		`-=======`
`58`		`-<<<<<<< HEAD`
`59`		- * Nicolas Grekas (`nicolas-grekas`_) can merge into theDebug_
`60`		`- component, theVarDumper_ component and theDebugBundle_;`
`61`		`-=======`
`62`	`54`	* Nicolas Grekas (`nicolas-grekas`_) can merge into theCache_,Debug_,
`63`	`55`	`Process_,PropertyAccess_,VarDumper_ components,PhpUnitBridge_ and`
`64`	`56`	`theDebugBundle_;`
`65`		`->>>>>>> 2.3`
`66`		`->>>>>>> 2.7`
`67`	`57`
`68`	`58`	* Christophe Coevoet (`stof`_) can merge into theBrowserKit_,
`69`	`59`	`Config_,Console_,DependencyInjection_,DomCrawler_,EventDispatcher_,`

Comments

(0)