Projects >> platform >>8bffce041dfd121af2d45a48a6b8a68f80b25262

Chunk
Conflicting content 
			long walletId = createNewWallet(passwordEncrypted);
			if (walletId > 0){
				jdbcTemplate.update(CREATE_USER_CLIENT_WALLET, new Object[]{userId,clientId,walletId});
<<<<<<< HEAD
			    walletPasswordSender.sendWalletPassword(userId,randomPassword,false);
=======
				walletPasswordSender.sendWalletPassword(userId,randomPassword,false);
>>>>>>> 3c409cdfde9399696737db5ba8bc06f26e8ec110
			}else{
				return load(userId, clientId, false);
			}
Solution content 
			long walletId = createNewWallet(passwordEncrypted);
			if (walletId > 0){
				jdbcTemplate.update(CREATE_USER_CLIENT_WALLET, new Object[]{userId,clientId,walletId});
				walletPasswordSender.sendWalletPassword(userId,randomPassword,false);
			}else{
				return load(userId, clientId, false);
			}
File
WalletDaoImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation