Projects >> jongo >>aa988ff7746f3ea0740acaa9fda47444e3fd7400

Chunk
Conflicting content 
package org.jongo.bson;

import com.mongodb.DBObject;
<<<<<<< HEAD
=======
import com.mongodb.LazyDBObject;
import org.bson.LazyBSONCallback;
>>>>>>> 57753d9b342ba712f40b3f2104b413c9720961fc

import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Solution content 
package org.jongo.bson;

import com.mongodb.DBObject;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;
File
LazyBsonDocument.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    public int getSize() {
        final ByteBuffer buffer = ByteBuffer.wrap(bytes);
<<<<<<< HEAD
        buffer.order(ByteOrder.LITTLE_ENDIAN);
=======
        buffer.order( ByteOrder.LITTLE_ENDIAN );
>>>>>>> 57753d9b342ba712f40b3f2104b413c9720961fc
        return buffer.getInt(0);
    }
Solution content 
    public int getSize() {
        final ByteBuffer buffer = ByteBuffer.wrap(bytes);
        buffer.order(ByteOrder.LITTLE_ENDIAN);
        return buffer.getInt(0);
    }
File
LazyBsonDocument.java
Developer's decision
Version 1
Kind of conflict
Method invocation