Fixing bad conflict fix

weaverryan · weaverryan · commit 0d71b6cc40ae · 2016-04-11T21:14:34.000-04:00
diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst
@@ -51,14 +51,9 @@ Active Core Members
   * **Romain Neutron** (`romainneutron`_) can merge into the
     Process_ component;
 
-<<<<<<< HEAD
-  * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Debug_
-    component, the VarDumper_ component and the DebugBundle_;
-=======
   * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Cache_, Debug_,
     Process_, PropertyAccess_, VarDumper_ components, PhpUnitBridge_ and
     the DebugBundle_;
->>>>>>> 2.3
 
   * **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
     bundles;
