Produced by Araxis Merge on 7/6/2017 8:23:21 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 | OSCIF_CTT_v4_build 1.zip\rails_komet\config\props | endpoint.properties.erb | Wed May 31 03:58:56 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\rails_komet\config\props | endpoint.properties.erb | Mon Jul 3 23:17:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 22 |
| 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 | # end isaa c_root wit h a slash '/' | |
| 2 | <% | |
| 3 | if (ENV['I SAAC_ROOT' ]) | |
| 4 | @isaac_r oot = ENV[ 'ISAAC_ROO T'] | |
| 5 | else | |
| 6 | #all urls must end i n a slash! !! | |
| 7 | @isaac_roo t = "['htt p://localh ost: PORT /', 'http: //localhos t: PORT /isaac-res t/', 'http s:// DNS : PORT /isaac-res t/' ]" | |
| 8 | end | |
| 9 | %> | |
| 10 | #order mat ters. The first url to respon d in a pos itive fash ion wins! | |
| 11 | <%= "isaac _root = #{ @isaac_roo t}" %> | |
| 12 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.