627. Araxis Merge File Comparison Report

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

627.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\QuickStart\WinForms\Properties	Resources.Designer.cs	Tue Dec 20 19:51:42 2016 UTC
2			Wed Feb 1 19:56:54 2017 UTC

627.2 Comparison summary

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

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

627.4 Active regular expressions

No regular expressions were active.

627.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 Microsoft. Crm.Sdk.Sa mples.Prop erties {
12		using System;
13
14
15		/// <s ummary>
16		/// A strongly -typed res ource clas s, for loo king up lo calized st rings, etc .
17		/// </ summary>
18		// Thi s class wa s auto-gen erated by the Strong lyTypedRes ourceBuild er
19		// cla ss via a t ool like R esGen or V isual Stud io.
20		// To add or rem ove a memb er, edit y our .ResX file then rerun ResG en
21		// wit h the /str option, o r rebuild your VS pr oject.
22		[globa l::System. CodeDom.Co mpiler.Gen eratedCode Attribute( "System.Re sources.To ols.Strong lyTypedRes ourceBuild er", "4.0. 0.0")]
23		[globa l::System. Diagnostic s.Debugger NonUserCod eAttribute ()]
24		[globa l::System. Runtime.Co mpilerServ ices.Compi lerGenerat edAttribut e()]
25		intern al class R esources {
26
27		pr ivate stat ic global: :System.Re sources.Re sourceMana ger resour ceMan;
28
29		pr ivate stat ic global: :System.Gl obalizatio n.CultureI nfo resour ceCulture;
30
31		[g lobal::Sys tem.Diagno stics.Code Analysis.S uppressMes sageAttrib ute("Micro soft.Perfo rmance", " CA1811:Avo idUncalled PrivateCod e")]
32		in ternal Res ources() {
33		}
34
35		// / <summary >
36		// / Return s the cach ed Resourc eManager i nstance us ed by this class.
37		// / </summar y>
38		[g lobal::Sys tem.Compon entModel.E ditorBrows ableAttrib ute(global ::System.C omponentMo del.Editor BrowsableS tate.Advan ced)]
39		in ternal sta tic global ::System.R esources.R esourceMan ager Resou rceManager {
40		get {
41		if ( object.Ref erenceEqua ls(resourc eMan, null )) {
42		global::Sy stem.Resou rces.Resou rceManager temp = ne w global:: System.Res ources.Res ourceManag er("Micros oft.Crm.Sd k.Samples. Properties .Resources ", typeof( Resources) .Assembly) ;
43		resourceMa n = temp;
44		}
45		retu rn resourc eMan;
46		}
47		}
48
49		// / <summary >
50		// / Overri des the cu rrent thre ad's Curre ntUICultur e property for all
51		// / resour ce lookups using thi s strongly typed res ource clas s.
52		// / </summar y>
53		[g lobal::Sys tem.Compon entModel.E ditorBrows ableAttrib ute(global ::System.C omponentMo del.Editor BrowsableS tate.Advan ced)]
54		in ternal sta tic global ::System.G lobalizati on.Culture Info Cultu re {
55		get {
56		retu rn resourc eCulture;
57		}
58		set {
59		reso urceCultur e = value;
60		}
61		}
62		}
63		}