1480. Araxis Merge File Comparison Report

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

1480.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\ckeditor\plugins\uicolor\lang pt-br.js Tue Dec 20 19:50:49 2016 UTC
2 Wed Feb 1 19:57:55 2017 UTC

1480.2 Comparison summary

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

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

1480.4 Active regular expressions

No regular expressions were active.

1480.5 Comparison detail

1   /*        
2    Copyright  (c) 2003- 2015, CKSo urce - Fre derico Kna bben. All  rights res erved.        
3    This soft ware is co vered by C KEditor Co mmercial L icense. Us age withou t proper l icense is  prohibited .        
4   */        
5   CKEDITOR.p lugins.set Lang("uico lor","pt-b r",{title: "Paleta de  Cores",pr eview:"Vis ualização  ao vivo",c onfig:"Col e o texto  no seu arq uivo confi g.js",pred efined:"Co njuntos de  cores pre definidos" });