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

147.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\hibernate	UserPrefDAOImpl.java	Fri Dec 7 17:36:32 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\persistent\hibernate	UserPrefDAOImpl.java	Thu Dec 13 15:06:33 2018 UTC

147.2 Comparison summary

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

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

147.4 Active regular expressions

No regular expressions were active.

147.5 Comparison detail

	1	/**
	2	*
	3	*/
	4	package go v.va.med.c cht.persis tent.hiber nate;
	5
	6	import jav a.util.Dat e;
	7	import jav a.util.Lis t;
	8
	9	import jav ax.transac tion.Trans actional;
	10
	11	import org .springfra mework.ste reotype.Re pository;
	12
	13	import gov .va.med.cc ht.model.U ser;
	14	import gov .va.med.cc ht.persist ent.UserPr efDAO;
	15	import gov .va.med.fw .persisten t.DAOExcep tion;
	16
	17	/**
	18	* @author DNS
	19	*
	20	*/
	21	@Repositor y
	22	@Transacti onal
	23	public cla ss UserPre fDAOImpl i mplements UserPrefDA O {
	24
	25	/* *
	26	* @see gov. va.med.cch t.persiste nt.UserPre fDAO#getHo lidays(gov .va.med.cc ht.model.U ser)
	27	* /
	28	@O verride
	29	pu blic List< Date> getH olidays(Us er user) t hrows DAOE xception {
	30	// T ODO Auto-g enerated m ethod stub
	31	retu rn null;
	32	}
	33
	34	}