714. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:56:57 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.

714.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\JS\FormScripts	TicketDependentOptionSetConfig.xml	Tue Dec 20 19:51:48 2016 UTC
2			Wed Feb 1 19:56:57 2017 UTC

714.2 Comparison summary

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

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

714.4 Active regular expressions

No regular expressions were active.

714.5 Comparison detail

1		<!--<snipp etTicketDe pendentOpt ionSetConf ig.xml>-->
2		<Dependent OptionSetC onfig
3		entity="sa mple_ticke t"
4		>
5
6		<ParentFie ld
7		id="sample _category"
8
9		label="Cat egory"
10		>
11
12		<Dependent Field
13		id="sample _subcatego ry"
14
15		label="Sub Category"
16		/>
17
18		<Option
19		value="727 000000"
20
21		label="Sof tware"
22		>
23
24		<ShowOptio n
25		value="727 000000"
26
27		label="Per sonal Prod uctivity"
28		/>
29
30		<ShowOptio n
31		value="727 000001"
32
33		label="Bus iness Appl ications"
34		/>
35
36		<ShowOptio n
37		value="727 000002"
38
39		label="Ope rating Sys tems"
40		/>
41
42		</Option>
43
44		<Option
45		value="727 000001"
46
47		label="Har dware"
48		>
49
50		<ShowOptio n
51		value="727 000003"
52
53		label="Des ktop Compu ter"
54		/>
55
56		<ShowOptio n
57		value="727 000004"
58
59		label="Lap top Comput er"
60		/>
61
62		<ShowOptio n
63		value="727 000005"
64
65		label="Mon itor"
66		/>
67
68		<ShowOptio n
69		value="727 000006"
70
71		label="Pri nter"
72		/>
73
74		<ShowOptio n
75		value="727 000007"
76
77		label="Tel ephone"
78		/>
79
80		</Option>
81
82		</ParentFi eld>
83
84		<ParentFie ld
85		id="sample _subcatego ry"
86
87		label="Sub Category"
88		>
89
90		<Dependent Field
91		id="sample _type"
92
93		label="Typ e"
94		/>
95
96		<Option
97		value="727 000000"
98
99		label="Per sonal Prod uctivity"
100		>
101
102		<ShowOptio n
103		value="727 000000"
104
105		label="Wor d Processo r"
106		/>
107
108		<ShowOptio n
109		value="727 000001"
110
111		label="Spr eadsheet"
112		/>
113
114		<ShowOptio n
115		value="727 000002"
116
117		label="Int ernet Brow ser"
118		/>
119
120		<ShowOptio n
121		value="727 000003"
122
123		label="E-m ail"
124		/>
125
126		</Option>
127
128		<Option
129		value="727 000001"
130
131		label="Bus iness Appl ications"
132		>
133
134		<ShowOptio n
135		value="727 000004"
136
137		label="Cus tomer Rela tionship M anagement"
138		/>
139
140		<ShowOptio n
141		value="727 000005"
142
143		label="Ent erprise Re source Man agement"
144		/>
145
146		<ShowOptio n
147		value="727 000006"
148
149		label="Hum an Resourc e Managmen t"
150		/>
151
152		</Option>
153
154		<Option
155		value="727 000002"
156
157		label="Ope rating Sys tems"
158		>
159
160		<ShowOptio n
161		value="727 000007"
162
163		label="Win dows Vista "
164		/>
165
166		<ShowOptio n
167		value="727 000008"
168
169		label="Win dows 7"
170		/>
171
172		<ShowOptio n
173		value="727 000009"
174
175		label="Win dows Serve r 2003"
176		/>
177
178		<ShowOptio n
179		value="727 000010"
180
181		label="Win dows Serve r 2008"
182		/>
183
184		</Option>
185
186		<Option
187		value="727 000003"
188
189		label="Des ktop Compu ter"
190		>
191
192		<ShowOptio n
193		value="727 000011"
194
195		label="Wor kstation x 1000"
196		/>
197
198		<ShowOptio n
199		value="727 000012"
200
201		label="Wor kstation x 2000"
202		/>
203
204		<ShowOptio n
205		value="727 000013"
206
207		label="Wor kstation x 3000"
208		/>
209
210		<ShowOptio n
211		value="727 000014"
212
213		label="Wor kstation x 4000"
214		/>
215
216		</Option>
217
218		<Option
219		value="727 000004"
220
221		label="Lap top Comput er"
222		>
223
224		<ShowOptio n
225		value="727 000015"
226
227		label="Lap top 1000 s eries"
228		/>
229
230		<ShowOptio n
231		value="727 000016"
232
233		label="Lap top 2000 s eries"
234		/>
235
236		<ShowOptio n
237		value="727 000017"
238
239		label="Lap top 3000 s eries"
240		/>
241
242		<ShowOptio n
243		value="727 000018"
244
245		label="Lap top 4000 s eries"
246		/>
247
248		</Option>
249
250		<Option
251		value="727 000005"
252
253		label="Mon itor"
254		>
255
256		<ShowOptio n
257		value="727 000019"
258
259		label="CRT -XYZ 17 in ch"
260		/>
261
262		<ShowOptio n
263		value="727 000020"
264
265		label="LCD -XYZ 17 in ch"
266		/>
267
268		<ShowOptio n
269		value="727 000021"
270
271		label="LCD -XYZ 21 in ch"
272		/>
273
274		<ShowOptio n
275		value="727 000022"
276
277		label="LCD -XYZ 24 in ch"
278		/>
279
280		</Option>
281
282		<Option
283		value="727 000006"
284
285		label="Pri nter"
286		>
287
288		<ShowOptio n
289		value="727 000023"
290
291		label="Ser ies 1000 P rinter - P rivate"
292		/>
293
294		<ShowOptio n
295		value="727 000024"
296
297		label="Ser ies 2000 C olor Print er - Priva te"
298		/>
299
300		<ShowOptio n
301		value="727 000025"
302
303		label="Ser ies 9000 P rinter - S hared"
304		/>
305
306		<ShowOptio n
307		value="727 000026"
308
309		label="Ser ies 9000 C olor Print er - Share d"
310		/>
311
312		</Option>
313
314		<Option
315		value="727 000007"
316
317		label="Tel ephone"
318		>
319
320		<ShowOptio n
321		value="727 000027"
322
323		label="PST N Phone"
324		/>
325
326		<ShowOptio n
327		value="727 000028"
328
329		label="IP Phone"
330		/>
331
332		<ShowOptio n
333		value="727 000029"
334
335		label="Mob ile Phone"
336		/>
337
338		</Option>
339
340		</ParentFi eld>
341		</Dependen tOptionSet Config>
342		<!--</snip petTicketD ependentOp tionSetCon fig.xml>-- >