150. EPMO Open Source Coordination Office Redaction File Detail Report

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

150.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\persistent	UserPrefDAO.java	Fri Dec 7 17:36:16 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\persistent	UserPrefDAO.java	Thu Dec 13 15:06:33 2018 UTC

150.2 Comparison summary

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

150.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

150.4 Active regular expressions

No regular expressions were active.

150.5 Comparison detail

	1	/**
	2	*
	3	*/
	4	package go v.va.med.c cht.persis tent;
	5
	6	import jav a.util.Dat e;
	7	import jav a.util.Lis t;
	8
	9	import gov .va.med.cc ht.model.U ser;
	10	import gov .va.med.fw .persisten t.DAOExcep tion;
	11
	12	/**
	13	* @author DNS
	14	*
	15	*/
	16	public int erface Use rPrefDAO {
	17	pu blic List< Date> getH olidays(Us er user) t hrows DAOE xception;
	18	}