From 55d778f530b91f418e8328af0cccf52a88ffbbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 24 Feb 2017 12:56:20 +0100 Subject: [PATCH] Fix faulty conflict resolution --- contributing/code/core_team.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 39e34807ce6..61d93ba8f6a 100644 --- 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_