Projects >> jedis >>5d0f75a32fb7e11f82949824f537fe16a789ac0d

Chunk
Conflicting content 
	return transaction;
    }

<<<<<<< HEAD
=======
    @Deprecated
    /**
     * This method is deprecated due to its error prone
     * and will be removed on next major release
     * You can use multi() instead
     * @see https://github.com/xetorthio/jedis/pull/498
     */
    public List multi(final TransactionBlock jedisTransaction) {
	jedisTransaction.setClient(client);
	client.multi();
	client.getOne();	// expected OK
	jedisTransaction.execute();
	return jedisTransaction.exec();
    }

>>>>>>> 076df8c92d0a01eedd16dc152fa9e579ffd2d873
    protected void checkIsInMulti() {
	if (client.isInMulti()) {
	    throw new JedisDataException(
Solution content 
	return transaction;
    }

    protected void checkIsInMulti() {
	if (client.isInMulti()) {
	    throw new JedisDataException(
File
BinaryJedis.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration