diff -r 1422c6cd3f0c -r c64cefac6e99 networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp --- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp Sat Feb 20 00:22:11 2010 +0200 +++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp Fri Mar 12 15:50:43 2010 +0200 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// portions Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,8 +13,6 @@ // Description: // IPSecPolManConflict - IPSec Policy Manager policy conflict checking routines // -// Portions Copyright (c) Symbian Software Ltd. 2007. -// Portions Copyright (c) Nokia Corporation 2005 - 2006. * Nokia Core OS * // Save as expressly licensed to you by Symbian Software Ltd, all rights reserved. //