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

696.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\LoginWindow CrmLogin.xaml Tue Dec 20 19:51:43 2016 UTC
2 Wed Feb 1 19:56:57 2017 UTC

696.2 Comparison summary

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

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

696.4 Active regular expressions

No regular expressions were active.

696.5 Comparison detail

1   <Window x: Class="Qui ckStartXRM ToolingWPF Client.Log inWindow.C rmLogin"        
2           xm lns="http: //schemas. microsoft. com/winfx/ 2006/xaml/ presentati on"        
3           xm lns:x="htt p://schema s.microsof t.com/winf x/2006/xam l"        
4           xm lns:CrmLog inCtrl="cl r-namespac e:Microsof t.Xrm.Tool ing.CrmCon nectContro l;assembly =Microsoft .Xrm.Tooli ng.CrmConn ectControl        
5           Ti tle="CRM L ogin" Widt h="465" He ight="471"        
6           Re sizeMode=" NoResize"         
7           Si zeToConten t="Height"        
8           Wi ndowStartu pLocation= "CenterScr een"         
9           Wi ndowStyle= "None"        
10           Al lowsTransp arency="Tr ue"         
11           Bo rderThickn ess="1"         
12           Bo rderBrush= "#173561"        
13           Lo aded="Wind ow_Loaded" >        
14       <Windo w.Resource s>        
15           <R esourceDic tionary>        
16                <Resourc eDictionar y.MergedDi ctionaries >        
17                    <Res ourceDicti onary Sour ce="pack:/ /applicati on:,,,/Mic rosoft.Xrm .Tooling.U i.Styles;c omponent/R esources/B utton/Styl es.xaml"/>        
18                </Resour ceDictiona ry.MergedD ictionarie s>        
19           </ ResourceDi ctionary>        
20       </Wind ow.Resourc es>        
21       <Grid>        
22           <C rmLoginCtr l:CrmServe rLoginCont rol Name=" CrmLoginCt rl" Grid.R ow="1" Sho wTitle="Fa lse"  Marg in="10,5"  VerticalAl ignment="B ottom" />        
23       </Grid >        
24   </Window>