Produced by Araxis Merge on 7/10/2017 1:01:46 PM 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 | C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\MIXWebApp | project.properties | Thu Jun 29 17:23:00 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\MIXWebApp | project.properties | Thu Jul 6 15:04:41 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 34 |
| Changed | 1 | 2 |
| 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 | # Project property f ile for Ex changeBusi ness | |
| 2 | ||
| 3 | maven.repo .remote = http\:// IP /maven,htt p\://meven ide.codeha us.org/rep ository,ht tp\://www. ibiblio.or g/maven | |
| 4 | ||
| 5 | compile.de bug=on | |
| 6 | compile.op timize=off | |
| 7 | compile.de precation= on | |
| 8 | maven.buil d.dir=${ba sedir}/tar get | |
| 9 | mavem.mult iproject.t ype=jar | |
| 10 | maven.juni t.fork=yes | |
| 11 | maven.war. src=${base dir}/WebRo ot | |
| 12 | ||
| 13 | # The foll owing line will dire ct the Jun it plugin to send st ack traces to the co nsole rath er than a file, | |
| 14 | # the loca tion of wh ich is a m ystery | |
| 15 | maven.juni t.usefile= false | |
| 16 | ||
| 17 | # direct t he compile r to put c ode genera ted during compilati on to the main/gener ated/java directory | |
| 18 | maven.comp ile.compil erargs=-s "${basedir }/main/gen erated/jav a" |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.