Projects >> realm-java >>0393fbf3112e9f78e6b0ed278dfc1e3b7ff5465a

Chunk
Conflicting content 
    private Handler handler;

    private final int id;
<<<<<<< HEAD
    private final String path;
    private final SharedGroup sharedGroup;
=======
    private SharedGroup sharedGroup;
>>>>>>> 3a93ed7e08fc9854b2a94ffd110fa43fa592c1f9
    private final ImplicitTransaction transaction;
    private final Map, String> simpleClassNames = new HashMap, String>();
    private final Map> generatedClasses = new HashMap>();
Solution content 
    private Handler handler;

    private final int id;
    private final String path;
    private SharedGroup sharedGroup;
    private final ImplicitTransaction transaction;
    private final Map, String> simpleClassNames = new HashMap, String>();
    private final Map> generatedClasses = new HashMap>();
File
Realm.java
Developer's decision
Combination
Kind of conflict
Attribute