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

Author: xabbuh

contributing/code/core_team.rst

@@ -66,7 +66,7 @@ Active Core Members
   * **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
     bundles;
 
-  * **Kévin Dunglas** (`dunglas`_) can merge into the Serializer_
+  * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_ and the Serializer_
     component;
 
   * **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_