Produced by Araxis Merge on 1/17/2019 10:54:40 AM Central 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | v1_iter_1_VIP_Build_4_Dec_2018_CG.zip\v1_iter_1_VIP_Build_4\portlets\caret-portlet\docroot\WEB-INF\src | rebel.xml | Wed Jan 16 16:06:46 2019 UTC |
| 2 | v1_iter_1_VIP_Build_4_Dec_2018_CG.zip\v1_iter_1_VIP_Build_4\portlets\caret-portlet\docroot\WEB-INF\src | rebel.xml | Wed Jan 16 21:40:46 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 76 |
| Changed | 2 | 4 |
| 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 | <?xml | |
| 2 | version="1 .0" | |
| 3 | encoding=" UTF-8" | |
| 4 | ?> | |
| 5 | <applicati on | |
| 6 | generated- by="eclips e" | |
| 7 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 8 | xmlns="htt p://www.ze roturnarou nd.com" | |
| 9 | xsi:schema Location=" http://www .zeroturna round.com http://upd ate.zerotu rnaround.c om/jrebel/ rebel-2_1. xsd" | |
| 10 | > | |
| 11 | ||
| 12 | ||
| 13 | <classpath > | |
| 14 | ||
| 15 | <dir | |
| 16 | name="C:/U sers/ DNS /workspace /core/port lets/caret -portlet/d ocroot/WEB -INF/class es" | |
| 17 | > | |
| 18 | ||
| 19 | </dir> | |
| 20 | ||
| 21 | </classpat h> | |
| 22 | ||
| 23 | ||
| 24 | <web> | |
| 25 | ||
| 26 | <link | |
| 27 | target="/" | |
| 28 | > | |
| 29 | ||
| 30 | <dir | |
| 31 | name="C:/U sers/ DNS /workspace /core/port lets/caret -portlet/d ocroot" | |
| 32 | > | |
| 33 | ||
| 34 | </dir> | |
| 35 | ||
| 36 | </link> | |
| 37 | ||
| 38 | </web> | |
| 39 | ||
| 40 | </applicat ion> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.