changeset 1205 | 6c6c27bcf9ac |
parent 771 | f57a88a76d61 |
child 3880 | 408b5915875e |
--- a/components/conflict/conflict.copyright Mon Mar 11 07:54:06 2013 -0700 +++ b/components/conflict/conflict.copyright Mon Mar 11 10:06:51 2013 -0700 @@ -1,9 +1,3 @@ ---------------------- -- 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