Commitf306a3c

committed

minor#7527 Fix faulty conflict resolution (dunglas)

This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes#7527).Discussion----------Fix faulty conflict resolutionRestoredd29e89Commits-------febdde0 Fix faulty conflict resolution

2 parentse879282 +febdde0 commitf306a3cCopy full SHA for f306a3c

File tree

1 file changed

-1

lines changed

contributing/code
- core_team.rst

1 file changed

-1

lines changed

`‎contributing/code/core_team.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ Active Core Members`
`66`	`66`	* Christophe Coevoet (`stof`_) can merge into all components, bridges and
`67`	`67`	`bundles;`
`68`	`68`
`69`		- * Kévin Dunglas (`dunglas`_) can merge into theSerializer_
	`69`	+ * Kévin Dunglas (`dunglas`_) can merge into thePropertyInfo_ and theSerializer_
`70`	`70`	`component;`
`71`	`71`
`72`	`72`	* Abdellatif AitBoudad (`aitboudad`_) can merge into theTranslation_

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitf306a3c

File tree

1 file changed

1 file changed

`‎contributing/code/core_team.rst‎`

0 commit comments