19. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-17 08:36:36 +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.

19.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Porto v3.2.4/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto	requirejs-config.js	2019-03-31 01:49:30 +0000
2	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto	requirejs-config.js	2020-08-16 03:21:14 +0000

19.2 Comparison summary

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

19.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

19.4 Active regular expressions

No regular expressions were active.

19.5 Comparison detail

1	var config = {	1	var config = {
2	paths: {	2	paths: {
3	'imagesloaded': 'Smartwave_Porto/js/imagesloaded',	3	'imagesloaded': 'Smartwave_Porto/js/imagesloaded',
4	'packery': 'Smartwave_Porto/js/packery.pkgd'	4	'packery': 'Smartwave_Porto/js/packery.pkgd',
		5	'instafeed': 'Smartwave_Porto/js/instafeed.min'
5	},	6	},
6	shim: {	7	shim: {
7	'imagesloaded': {	8	'imagesloaded': {
8	deps: ['jquery']	9	deps: ['jquery']
9	},	10	},
10	'packery': {	11	'packery': {
11	deps: ['jquery']	12	deps: ['jquery']
		13	},
		14	'instafeed': {
		15	deps: ['jquery']
12	}	16	}
13	}	17	}
14	};	18	};