1605. Araxis Merge File Comparison Report

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

1605.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 Portal\trunk\BTSSSPortal\js\google-code-prettify prettify.css Tue Dec 20 19:50:52 2016 UTC
2 Wed Feb 1 19:57:58 2017 UTC

1605.2 Comparison summary

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

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

1605.4 Active regular expressions

No regular expressions were active.

1605.5 Comparison detail

1   .prettypri nt {        
2     padding:  8px;        
3     backgrou nd-color:  #f7f7f9;        
4     border:  1px solid  #e1e1e8;        
5   }        
6          
7   .prettypri nt[class*= "linenums" ] {        
8     -webkit- box-shadow : inset 40 px 0 0 #fb fbfc, inse t 41px 0 0  #ececf0;        
9        -moz- box-shadow : inset 40 px 0 0 #fb fbfc, inse t 41px 0 0  #ececf0;        
10              box-shadow : inset 40 px 0 0 #fb fbfc, inse t 41px 0 0  #ececf0;        
11   }        
12          
13   .prettypri nt .com {  color: #93 a1a1; }        
14   .prettypri nt .lit {  color: #19 5f91; }        
15   .prettypri nt .pun, . prettyprin t .opn, .p rettyprint  .clo { co lor: #93a1 a1; }        
16   .prettypri nt .fun {  color: #dc 322f; }        
17   .prettypri nt .str, . prettyprin t .atv { c olor: #D14 ; }        
18   .prettypri nt .kwd, . prettyprin t .tag { c olor: #1e3 47b; }        
19   .prettypri nt .typ, . prettyprin t .atn, .p rettyprint  .dec, .pr ettyprint  .var { col or: teal;  }        
20   .prettypri nt .pln {  color: #48 484c; }        
21          
22   ol.linenum s {        
23     margin:  0 0 0 33px ; /* IE in dents via  margin-lef t */        
24          
25          
26   ol.linenum s li {        
27     padding- left: 12px ;        
28     color: # bebec5;        
29     line-hei ght: 18px;        
30     text-sha dow: 0 1px  0 #fff;        
31   }