Fix faulty conflict resolution

dunglas · xabbuh · commit febdde03f538 · 2017-02-28T21:25:20.000+01:00
diff --git a/contributing/code/core_team.rst b/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_
