306. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:56:29 PM Eastern Standard Time. 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.

306.1 Files compared

#	Location	File	Last Modified
1	C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM\trunk\SDK\SampleCode\CS\Client\WebResources\ImportWebResources\ImportWebResources	ImportJob.xml	Tue Dec 20 19:51:45 2016 UTC
2			Wed Feb 1 19:56:29 2017 UTC

306.2 Comparison summary

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

306.3 Comparison options

Whitespace
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

306.4 Active regular expressions

No regular expressions were active.

306.5 Comparison detail

1		<?xml
2		version="1 .0"
3		encoding=" utf-8"
4		?>
5		<job>
6
7		<webResour ce>
8
9		<path>
10		FilesToImp ort\CSS\St yles.css
11		</path>
12
13		<displayNa me>
14		Web Resour ce Import Sample Sty les.css fi le
15		</displayN ame>
16
17		<descripti on>
18		Provides C SS styles for the sa mple_/Impo rtWebResou rces/ShowD ata.htm We b resource .
19		</descript ion>
20
21		<name>
22		_/ImportWe bResources /CSS/Style s.css
23		</name>
24
25		<type
26		name="Css"
27		>
28		2
29		</type>
30
31		</webResou rce>
32
33		<webResour ce>
34
35		<path>
36		FilesToImp ort\Data\D ata.xml
37		</path>
38
39		<displayNa me>
40		Web Resour ce Import Sample Dat a.xml file
41		</displayN ame>
42
43		<descripti on>
44		Provides d ata for th e sample_/ ImportWebR esources/S howData.ht m Web reso urce.
45		</descript ion>
46
47		<name>
48		_/ImportWe bResources /Data/Data .xml
49		</name>
50
51		<type
52		name="Xml"
53		>
54		4
55		</type>
56
57		</webResou rce>
58
59		<webResour ce>
60
61		<path>
62		FilesToImp ort\Script \Script.js
63		</path>
64
65		<displayNa me>
66		Web Resour ce Import Sample Scr ipt.js fil e
67		</displayN ame>
68
69		<descripti on>
70		Provides t he SDK.Imp ortWebReso urces JScr ipt librar y for the sample_/Im portWebRes ources/Sho wData.htm Web resour ce.
71		</descript ion>
72
73		<name>
74		_/ImportWe bResources /Script/Sc ript.js
75		</name>
76
77		<type
78		name="JScr ipt"
79		>
80		3
81		</type>
82
83		</webResou rce>
84
85		<webResour ce>
86
87		<path>
88		FilesToImp ort\XSL\Tr ansform.xs l
89		</path>
90
91		<displayNa me>
92		Web Resour ce Import Sample Tra nsform.xsl file
93		</displayN ame>
94
95		<descripti on>
96		Provides a transform for the s ample_/Imp ortWebReso urces/Show Data.htm W eb resourc e.
97		</descript ion>
98
99		<name>
100		_/ImportWe bResources /XSL/Trans form.xsl
101		</name>
102
103		<type
104		name="Styl esheet_XSL "
105		>
106		9
107		</type>
108
109		</webResou rce>
110
111		<webResour ce>
112
113		<path>
114		FilesToImp ort\ShowDa ta.htm
115		</path>
116
117		<displayNa me>
118		Web Resour ce Import Sample Sho wData.htm file
119		</displayN ame>
120
121		<descripti on>
122		The HTML W eb resourc e for the sample.
123		</descript ion>
124
125		<name>
126		_/ImportWe bResources /ShowData. htm
127		</name>
128
129		<type
130		name="Html "
131		>
132		1
133		</type>
134
135		</webResou rce>
136		</job>