Skip to content

Commit 065175e

Browse files
author
Hayder Sharhan
committed
MAGETWO-54586: [Github][PR] Fix #3637 Add missing catalogsearch layout for swatches. #3638
- Merge process wasn't fully done, Fixed.
1 parent 7fd3b03 commit 065175e

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

app/code/Magento/Swatches/view/frontend/layout/catalogsearch_result_index.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
<<<<<<< HEAD
54
* Copyright © 2016 Magento. All rights reserved.
6-
=======
7-
* Copyright © 2015 Magento. All rights reserved.
8-
>>>>>>> 074b81daf148a9424c5627b34d64b01136d3a4c6
95
* See COPYING.txt for license details.
106
*/
117
-->

0 commit comments

Comments
 (0)