58. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Dec 13 16:40:55 2019 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

58.1 Files compared

#	Location	File	Last Modified
1	Porto v.3.2.1\Theme Files\Magento 1.x\Porto Theme\app\code\local\Smartwave\Porto\Model\System\Config\Source\Setting\General	Layout.php	Thu Feb 5 22:58:12 2015 UTC
2	Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\code\local\Smartwave\Porto\Model\System\Config\Source\Setting\General	Layout.php	Fri Dec 13 13:03:20 2019 UTC

58.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	2	26
Changed	1	2
Inserted	0	0
Removed	0	0

58.3 Comparison options

Whitespace	All differences in whitespace within lines are ignored
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

58.4 Active regular expressions

No regular expressions were active.

58.5 Comparison detail

1	<?php	1	<?php
2		2
3	class Smar twave_Port o_Model_Sy stem_Confi g_Source_S etting_Gen eral_Layou t	3	class Smar twave_Port o_Model_Sy stem_Confi g_Source_S etting_Gen eral_Layou t
4	{	4	{
5	public function toOptionAr ray()	5	public function toOptionAr ray()
6	{	6	{
7	re turn array (	7	re turn array (
8	array('val ue' => '0', 'label' => Mage::help er('porto' )->__('11 7 0px')),	8	array('val ue' => '0', 'label' => Mage::help er('porto' )->__('11 4 0px')),
9	array('v alue' => ' 1024', 'la bel' => Ma ge::helper ('porto')- >__('1024p x')),	9	array('v alue' => ' 1024', 'la bel' => Ma ge::helper ('porto')- >__('1024p x')),
10	array('v alue' => ' 1280', 'la bel' => Ma ge::helper ('porto')- >__('1280p x')),	10	array('v alue' => ' 1280', 'la bel' => Ma ge::helper ('porto')- >__('1280p x')),
11	array('v alue' => ' full_width ', 'label' => Mage:: helper('po rto')->__( 'Full Widt h'))	11	array('v alue' => ' full_width ', 'label' => Mage:: helper('po rto')->__( 'Full Widt h'))
12	);	12	);
13	}	13	}
14	}	14	}