463. Araxis Merge File Comparison Report

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

463.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\Metadata\Diagram\Properties	Settings.Designer.cs	Tue Dec 20 19:51:46 2016 UTC
2			Wed Feb 1 19:56:46 2017 UTC

463.2 Comparison summary

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

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

463.4 Active regular expressions

No regular expressions were active.

463.5 Comparison detail

1		//-------- ---------- ---------- ---------- ---------- ---------- ---------- ----------
2		// <auto-g enerated>
3		// Thi s code was generated by a tool .
4		// Run time Versi on:4.0.303 19.34209
5		//
6		// Cha nges to th is file ma y cause in correct be havior and will be l ost if
7		// the code is r egenerated .
8		// </auto- generated>
9		//-------- ---------- ---------- ---------- ---------- ---------- ---------- ----------
10
11		namespace MetadataDi agramConso le.Propert ies {
12
13
14		[globa l::System. Runtime.Co mpilerServ ices.Compi lerGenerat edAttribut e()]
15		[globa l::System. CodeDom.Co mpiler.Gen eratedCode Attribute( "Microsoft .VisualStu dio.Editor s.Settings Designer.S ettingsSin gleFileGen erator", " 12.0.0.0") ]
16		intern al sealed partial cl ass Settin gs : globa l::System. Configurat ion.Applic ationSetti ngsBase {
17
18		pr ivate stat ic Setting s defaultI nstance = ((Settings )(global:: System.Con figuration .Applicati onSettings Base.Synch ronized(ne w Settings ())));
19
20		pu blic stati c Settings Default {
21		get {
22		retu rn default Instance;
23		}
24		}
25		}
26		}