--- a/components/conflict/conflict.copyright	Tue Apr 17 00:51:00 2012 -0700
+++ b/components/conflict/conflict.copyright	Tue Apr 17 09:10:45 2012 -0700
@@ -1,4 +1,10 @@
-Copyright 1995, 2004 by Thomas E. Dickey
+---------------------
+- conflict 20100627 -
+---------------------
+
+Oracle Internal Tracking Number 5761
+
+Copyright 1995-2004,2010 by Thomas E. Dickey
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,