8000 minor #7527 Fix faulty conflict resolution (dunglas) · symfony/symfony-docs@f306a3c · GitHub
[go: up one dir, main page]
Skip to content

Commit f306a3c

Browse files
xabbuhxabbuh
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 resolution Restore dd29e89 Commits ------- febdde0 Fix faulty conflict resolution
2 parents e879282 + febdde0 commit f306a3c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎contributing/code/core_team.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Active Core Members
6666
* **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
6767
bundles;
6868

69-
* **Kévin Dunglas** (`dunglas`_) can merge into the Serializer_
69+
* **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_ and the Serializer_
7070
component;
7171

7272
* **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_

0 commit comments

Comments
 (0)
0