Produced by Araxis Merge on 6/20/2018 10:12:11 AM Central Daylight 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.
# | Location | File | Last Modified |
---|---|---|---|
1 | CCRS.zip\CCRS\ccra-2.5.0.zip\ccra-2.5.0-1582193c50aced3fa6ab803711ab119c7d5c9158\CCRABatch\src\main\resources | config.properties | Mon Apr 9 15:28:51 2018 UTC |
2 | CCRS.zip\CCRS\ccra-2.5.0.zip\ccra-2.5.0-1582193c50aced3fa6ab803711ab119c7d5c9158\CCRABatch\src\main\resources | config.properties | Thu Jun 14 13:39:07 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 40 |
Changed | 2 | 12 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
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 |
No regular expressions were active.
1 | <<<<<<< HE AD | |
2 | sftpServer =ftcsftp.f tc-llc.com | |
3 | sftpServer P ORT = PORT | |
4 | sftpUser= AI | |
5 | sftpPasswo rd=A I | |
6 | sftpPath=C CRA_Upload s/ | |
7 | sftpArchiv eFolderPat h=CCRS_Arc hived/ | |
8 | targetFold er=c:/sFTP Files/ | |
9 | Compressfi leExt=.gz | |
10 | Uncompress fileExt=.j son | |
11 | filePath=c :/temp/err ors/ | |
12 | fileName=c craerrors. txt | |
13 | ======= | |
14 | sftpServer =ftcsftp.f tc-llc.com | |
15 | sftpServer P ORT = PORT | |
16 | sftpUser= AI | |
17 | sftpPasswo rd=A I | |
18 | sftpPath=C CRA_Upload s/ | |
19 | sftpArchiv eFolderPat h=CCRS_Arc hived/ | |
20 | targetFold er=c:/sFTP Files/ | |
21 | Compressfi leExt=.gz | |
22 | Uncompress fileExt=.j son | |
23 | filePath=c :/temp/err ors/ | |
24 | fileName=c craerrors. txt | |
25 | build.vers ion=@build .version@ | |
26 | >>>>>>> re fs/remotes /origin/Sp rint4_0316 2018 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.