162. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:59 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

162.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/General	Layout.php	2017-12-05 23:51:20 +0000
2	/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/General	Layout.php	2021-01-08 08:07:26 +0000

162.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	42
Changed	2	4
Inserted	0	0
Removed	0	0

162.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

162.4 Active regular expressions

No regular expressions were active.

162.5 Comparison detail

1	<?php	1	<?php
2	namespace Smartwave\Porto\Model\Config\Settings\General;	2	namespace Smartwave\Porto\Model\Config\Settings\General;
3		3
4	class Layout implements \Magento\Framework\Option\ArrayInterface	4	class Layout implements \Magento\Framework\Option\ArrayInterface
5	{	5	{
6	public function toOptionArray()	6	public function toOptionArray()
7	{	7	{
8	return [	8	return [
9	['value' => '1140', 'label' => __('1140px (Default)')],	9	['value' => '1140', 'label' => __('1140px (Default)')],
10	['value' => '1280', 'label' => __('1280px')],	10	['value' => '1220', 'label' => __('1220px')],
11	['value' => 'full_width', 'label' => __('Full Width')]	11	['value' => 'full_width', 'label' => __('Full Width')]
12	];	12	];
13	}	13	}
14		14
15	public function toArray()	15	public function toArray()
16	{	16	{
17	return [	17	return [
18	'1140' => __('1140px (Default)'),	18	'1140' => __('1140px (Default)'),
19	'1280' => __('1280px'),	19	'1220' => __('1220px'),
20	'full_width' => __('Full Width')	20	'full_width' => __('Full Width')
21	];	21	];
22	}	22	}
23	}	23	}