1124. Araxis Merge File Comparison Report

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

1124.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\about\dialogs	about.js	Tue Dec 20 19:50:46 2016 UTC
2			Wed Feb 1 19:57:46 2017 UTC

1124.2 Comparison summary

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

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

1124.4 Active regular expressions

No regular expressions were active.

1124.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.d ialog.add( "about",fu nction(a){ a=a.lang.a bout;var b =CKEDITOR. getUrl(CKE DITOR.plug ins.get("a bout").pat h+"dialogs /"+(CKEDIT OR.env.hid pi?"hidpi/ ":"")+"log o_ckeditor .png");ret urn{title: CKEDITOR.e nv.ie?a.dl gTitle:a.t itle,minWi dth:390,mi nHeight:23 0,contents :[{id:"tab 1",label:" ",title:"" ,expand:!0 ,padding:0 ,elements: [{type:"ht ml",html:' \x3cstyle type\x3d"t ext/css"\x 3e.cke_abo ut_contain er{color:# 000 !impor tant;paddi ng:10px 10 px 0;margi n-top:5px} .cke_about _container p{margin: 0 0 10px; }.cke_abou t_containe r .cke_abo ut_logo{he ight:81px; background -color:#ff f;backgrou nd-image:u rl('+
6		b+");"+(CK EDITOR.env .hidpi?"ba ckground-s ize:163px 58px;":"") +'backgrou nd-positio n:center; background -repeat:no -repeat;ma rgin-botto m:10px;}.c ke_about_c ontainer a {cursor:po inter !imp ortant;col or:#00B2CE !importan t;text-dec oration:un derline !i mportant;} \x3c/style \x3e\x3cdi v class\x3 d"cke_abou t_containe r"\x3e\x3c div class\ x3d"cke_ab out_logo"\ x3e\x3c/di v\x3e\x3cp \x3eCKEdit or '+CKEDI TOR.versio n+" (revis ion "+CKED ITOR.revis ion+')\x3c br\x3e\x3c a target\x 3d"_blank" href\x3d" http://cke ditor.com/ "\x3ehttp: //ckeditor .com\x3c/a \x3e\x3c/p \x3e\x3cp\ x3e'+
7		a.help.rep lace("$1", '\x3ca tar get\x3d"_b lank" href \x3d"http: //docs.cke ditor.com/ user"\x3e' +a.userGui de+"\x3c/a \x3e")+"\x 3c/p\x3e\x 3cp\x3e"+a .moreInfo+ '\x3cbr\x3 e\x3ca tar get\x3d"_b lank" href \x3d"http: //ckeditor .com/about /license"\ x3ehttp:// ckeditor.c om/about/l icense\x3c /a\x3e\x3c /p\x3e\x3c p\x3e'+a.c opy.replac e("$1",'\x 3ca target \x3d"_blan k" href\x3 d"http://c ksource.co m/"\x3eCKS ource\x3c/ a\x3e - Fr ederico Kn abben')+"\ x3c/p\x3e\ x3c/div\x3 e"}]}],but tons:[CKED ITOR.dialo g.cancelBu tton]}});