516. Araxis Merge File Comparison Report

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

516.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\ModernAndMobileApps\ModernOdataApp	App.xaml	Tue Dec 20 19:51:47 2016 UTC
2			Wed Feb 1 19:56:49 2017 UTC

516.2 Comparison summary

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

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

516.4 Active regular expressions

No regular expressions were active.

516.5 Comparison detail

1		<Applicati on
2		x:Clas s="ModernO dataApp.Ap p"
3		xmlns= "http://sc hemas.micr osoft.com/ winfx/2006 /xaml/pres entation"
4		xmlns: x="http:// schemas.mi crosoft.co m/winfx/20 06/xaml"
5		xmlns: local="usi ng:ModernO dataApp">
6
7		<Appli cation.Res ources>
8		<R esourceDic tionary>
9		<Resourc eDictionar y.MergedDi ctionaries >
10
11		<!--
12		Styles tha t define c ommon aspe cts of the platform look and f eel
13		Required b y Visual S tudio proj ect and it em templat es
14		-->
15		<Res ourceDicti onary Sour ce="Common /StandardS tyles.xaml "/>
16		</Resour ceDictiona ry.MergedD ictionarie s>
17
18		</ ResourceDi ctionary>
19		</Appl ication.Re sources>
20		</Applicat ion>