Merge commit 'refs/pull/3638/head' of https://github.com/magento/magento2 into MAGETWO-54586-PublicPR-3638

Hayder Sharhan · Hayder Sharhan · commit 7fd3b039a6ae · 2016-07-25T15:21:56.000-05:00
# Conflicts:
#	app/code/Magento/Swatches/view/frontend/layout/catalogsearch_result_index.xml
diff --git a/app/code/Magento/Swatches/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Swatches/view/frontend/layout/catalogsearch_result_index.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0"?>
 <!--
 /**
+<<<<<<< HEAD
  * Copyright © 2016 Magento. All rights reserved.
+=======
+ * Copyright © 2015 Magento. All rights reserved.
+>>>>>>> 074b81daf148a9424c5627b34d64b01136d3a4c6
  * See COPYING.txt for license details.
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
         <css src="Magento_Swatches::css/swatches.css"/>
     </head>
+    <body>
+        <referenceBlock name="category.product.type.details.renderers">
+            <block class="Magento\Swatches\Block\Product\Renderer\Listing\Configurable" as="configurable" template="Magento_Swatches::product/listing/renderer.phtml" />
+        </referenceBlock>
+    </body>
 </page>
