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

699.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\XRMTooling\QuickStartXRMToolingWPFClient\Properties	Resources.Designer.cs	Tue Dec 20 19:51:43 2016 UTC
2			Wed Feb 1 19:56:57 2017 UTC

699.2 Comparison summary

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

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

699.4 Active regular expressions

No regular expressions were active.

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