Produced by Araxis Merge on 6/9/2017 3:50:05 PM Eastern 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 | Fri Jun 9 19:50:05 2017 UTC | ||
| 2 | eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-env | assembly-descriptor.xml | Fri Apr 21 20:03:26 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 126 |
| 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 | <assembly> | |||||
| 6 | ||||||
| 7 | <id> | |||||
| 8 | scripts | |||||
| 9 | </id> | |||||
| 10 | ||||||
| 11 | <formats> | |||||
| 12 | ||||||
| 13 | <format> | |||||
| 14 | tar.gz | |||||
| 15 | </format> | |||||
| 16 | ||||||
| 17 | <format> | |||||
| 18 | zip | |||||
| 19 | </format> | |||||
| 20 | ||||||
| 21 | </formats> | |||||
| 22 | ||||||
| 23 | <includeBa seDirector y> | |||||
| 24 | true | |||||
| 25 | </includeB aseDirecto ry> | |||||
| 26 | ||||||
| 27 | <fileSets> | |||||
| 28 | ||||||
| 29 | <fileSet> | |||||
| 30 | ||||||
| 31 | <directory > | |||||
| 32 | src/main/r esources | |||||
| 33 | </director y> | |||||
| 34 | ||||||
| 35 | <outputDir ectory> | |||||
| 36 | / | |||||
| 37 | </outputDi rectory> | |||||
| 38 | ||||||
| 39 | <includes> | |||||
| 40 | ||||||
| 41 | <include> | |||||
| 42 | pom.xml | |||||
| 43 | </include> | |||||
| 44 | ||||||
| 45 | </includes > | |||||
| 46 | ||||||
| 47 | <lineEndin g> | |||||
| 48 | unix | |||||
| 49 | </lineEndi ng> | |||||
| 50 | ||||||
| 51 | <fileMode> | |||||
| 52 | 0760 | |||||
| 53 | </fileMode > | |||||
| 54 | ||||||
| 55 | <directory Mode> | |||||
| 56 | 0750 | |||||
| 57 | </director yMode> | |||||
| 58 | ||||||
| 59 | </fileSet> | |||||
| 60 | ||||||
| 61 | <fileSet> | |||||
| 62 | ||||||
| 63 | <directory > | |||||
| 64 | src/main/r esources/p roperties | |||||
| 65 | </director y> | |||||
| 66 | ||||||
| 67 | <outputDir ectory> | |||||
| 68 | /src/main/ resources/ properties | |||||
| 69 | </outputDi rectory> | |||||
| 70 | ||||||
| 71 | <includes> | |||||
| 72 | ||||||
| 73 | <include> | |||||
| 74 | *.properti es | |||||
| 75 | </include> | |||||
| 76 | ||||||
| 77 | </includes > | |||||
| 78 | ||||||
| 79 | <lineEndin g> | |||||
| 80 | unix | |||||
| 81 | </lineEndi ng> | |||||
| 82 | ||||||
| 83 | <fileMode> | |||||
| 84 | 0760 | |||||
| 85 | </fileMode > | |||||
| 86 | ||||||
| 87 | <directory Mode> | |||||
| 88 | 0750 | |||||
| 89 | </director yMode> | |||||
| 90 | ||||||
| 91 | </fileSet> | |||||
| 92 | ||||||
| 93 | <fileSet> | |||||
| 94 | ||||||
| 95 | <directory > | |||||
| 96 | src/main/p ython | |||||
| 97 | </director y> | |||||
| 98 | ||||||
| 99 | <outputDir ectory> | |||||
| 100 | /src/main/ python | |||||
| 101 | </outputDi rectory> | |||||
| 102 | ||||||
| 103 | <includes> | |||||
| 104 | ||||||
| 105 | <include> | |||||
| 106 | **/*.py | |||||
| 107 | </include> | |||||
| 108 | ||||||
| 109 | </includes > | |||||
| 110 | ||||||
| 111 | <lineEndin g> | |||||
| 112 | unix | |||||
| 113 | </lineEndi ng> | |||||
| 114 | ||||||
| 115 | <fileMode> | |||||
| 116 | 0760 | |||||
| 117 | </fileMode > | |||||
| 118 | ||||||
| 119 | <directory Mode> | |||||
| 120 | 0750 | |||||
| 121 | </director yMode> | |||||
| 122 | ||||||
| 123 | </fileSet> | |||||
| 124 | ||||||
| 125 | </fileSets > | |||||
| 126 | </assembly > |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.