945. Araxis Merge File Comparison Report

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

945.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\Tools\WebResourceUtility\Views	ErrorWindow.xaml.cs	Tue Dec 20 19:52:28 2016 UTC
2			Wed Feb 1 19:57:36 2017 UTC

945.2 Comparison summary

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

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

945.4 Active regular expressions

No regular expressions were active.

945.5 Comparison detail

1		using Syst em;
2		using Syst em.Windows ;
3		using Syst em.Windows .Controls;
4
5		namespace Microsoft. Crm.Sdk.Sa mples
6		{
7		/// <s ummary>
8		/// In teraction logic for ErrorWindo w.xaml
9		/// </ summary>
10		public partial c lass Error Window : W indow
11		{
12		pu blic Strin g Message { get; set ; }
13
14		pu blic Error Window()
15		{
16		Initiali zeComponen t();
17		}
18
19		pu blic Error Window(str ing errorM essage)
20		{
21		Initiali zeComponen t();
22
23		Message = errorMes sage;
24
25		this.Dat aContext = Message;
26		}
27
28		pr ivate void OKButton_ Click(obje ct sender, RoutedEve ntArgs e)
29		{
30		this.Dia logResult = true;
31		}
32		}
33		}