--- package/source/xstor/xstorage.cxx	2004-08-04 19:46:55.631443352 +0200
+++ package/source/xstor/xstorage.cxx.new	2004-08-04 19:49:21.184315952 +0200
@@ -688,13 +688,8 @@
 		// TODO: copy encrypted element
 		if ( !pElement->m_pStream->IsEncrypted() )
 		{
-<<<<<<< xstorage.cxx
 			uno::Reference< io::XStream > xSubStr =
 										xDest->openStreamElement( pElement->m_aName,
-=======
-			uno::Reference< io::XStream > xSubStr = 
-										xDest->openStreamElement( aName,
->>>>>>> 1.9
 										embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
 			OSL_ENSURE( xSubStr.is(), "No destination substream!\n" );
 
@@ -702,13 +697,8 @@
 		}
 		else if ( pElement->m_pStream->HasCachedPassword() && pElement->m_pStream->IsModified() )
 		{
-<<<<<<< xstorage.cxx
 			uno::Reference< io::XStream > xSubStr =
 										xDest->openEncryptedStreamElement( pElement->m_aName,
-=======
-			uno::Reference< io::XStream > xSubStr = 
-										xDest->openEncryptedStreamElement( aName,
->>>>>>> 1.9
 											embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE,
 											pElement->m_pStream->GetCachedPassword() );
 			OSL_ENSURE( xSubStr.is(), "No destination substream!\n" );
@@ -1601,15 +1591,12 @@
 
 	xComponent->addEventListener( uno::Reference< lang::XEventListener >(
 		static_cast< ::cppu::OWeakObject* >( m_pData->m_pSubElDispListener ), uno::UNO_QUERY ) );
-<<<<<<< xstorage.cxx
 
 	sal_Int32 nLength = m_pData->m_aOpenSubComponentsList.getLength();
 	m_pData->m_aOpenSubComponentsList.realloc( nLength + 1 );
 	m_pData->m_aOpenSubComponentsList[nLength] = xComponent;
-=======
 	
 	m_pData->m_aOpenSubComponentsList.push_back( xComponent );
->>>>>>> 1.9
 }
 
 //____________________________________________________________________________________________________