159. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/13/2018 10:35:24 AM Eastern 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.

159.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\service\common	MergeService.java	Fri Dec 7 17:36:30 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\service\common	MergeService.java	Wed Dec 12 22:33:39 2018 UTC

159.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	2	44
Changed	1	2
Inserted	0	0
Removed	0	0

159.3 Comparison options

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

159.4 Active regular expressions

No regular expressions were active.

159.5 Comparison detail

	1	/******* ****** ****** ****** ****** ****** *******
	2	* Copyrig ht � 2010 VHA. All r ights rese rved
	3	******* ****** ****** ****** ****** ****** *******/
	4	package go v.va.med.c cht.servic e.common;
	5
	6	import jav a.io.Seria lizable;
	7
	8	import gov .va.med.cc ht.model.U ser;
	9	import gov .va.med.cc ht.model.q ir.QIR;
	10	import gov .va.med.fw .security. Role;
	11	import gov .va.med.fw .service.S erviceExce ption;
	12
	13
	14	/**
	15	* @author DNS
	16	*
	17	*/
	18	public int erface Mer geService extends Se rializable {
	19	pu blic User mergeUser( User incom ing, User onFile) th rows Servi ceExceptio n;
	20	pu blic Role mergeRole( Role incom ing, Role onFile) th rows Servi ceExceptio n;
	21	pu blic QIR m ergeQIR(QI R incoming , QIR onFi le) throws ServiceEx ception;
	22	}
	23