symfony · adell · Jun 25, 2010 · Jul 20, 2010 · Jul 26, 2010 · Jul 23, 2010
diff --git a/guides/doctrine/configuration.rst b/guides/doctrine/configuration.rst
@@ -4,8 +4,12 @@ Doctrine Configuration
 DBAL Configuration
 ------------------
 
+<<<<<<< HEAD:guides/doctrine/configuration.rst
 .. code-block:: yaml
 
+=======
+    [yml]
+>>>>>>> origin/PR3:guides/en/Doctrine/Configuration.markdown
     # config/config.yml
     doctrine.dbal:
         driver:   PDOMySql
@@ -64,7 +68,18 @@ but you must pass it an argument with the name of the connection you want to get
 ORM Configuration
 -----------------
 
+<<<<<<< HEAD:guides/doctrine/configuration.rst
 .. code-block:: yaml
+=======
+    doctrine.orm:
+      default_entity_manager:   default
+      cache_driver:             apc           # array, apc, memcache, xcache
+      entity_managers:
+        default:
+          connection:           default
+        customer:
+          connection:           customer
+>>>>>>> origin/PR3:guides/en/Doctrine/Configuration.markdown
 
     doctrine.orm:
       default_entity_manager:   default
@@ -150,4 +165,4 @@ or options:
       :drop                        Processes the schema and either drop the database schema of EntityManager Storage Connection or generate the SQL output.
       :update                      Processes the schema and either update the database schema of EntityManager Storage Connection or generate the SQL output.
 
-    ...
+    ...
diff --git a/guides/testing/recipes.rst b/guides/testing/recipes.rst
@@ -96,6 +96,10 @@ to check the number of database calls, the time spent in the framework, ...
 But before writing assertions, always check that the profiler is indeed
 available (it is enabled by default in the ``test`` environment)::
 
+<<<<<<< HEAD:guides/testing/recipes.rst
+=======
+    [php]
+>>>>>>> origin/PR3:guides/en/Testing/Recipes.markdown
     if ($profiler = $client->getProfiler()) {
         // check the number of requests
         $this->assertTrue($profiler['db']->getQueryCount() < 10);