Projects >> evrythng-java-sdk >>9deb52463e96bd2eda476faabdc3de17e1ac9c94

Chunk
Conflicting content 
		super(name, version);
		actionDeserializer = createActionDeserializer();
		addDeserializer(Action.class, actionDeserializer);
<<<<<<< HEAD
		addDeserializer(Actions.class, new ActionsDeserializer());
=======
		addDeserializer(Actions.class, new ActionsDeserializer(actionDeserializer));
		reactionDeserializer = createReactionDeserializer();
		geoJSONDeserializer = createGeoJSONDeserializer();
		PropertyDeserializer propertyDeserializer = new PropertyDeserializer();
		addDeserializer(Reaction.class, reactionDeserializer);
		addDeserializer(GeoJson.class, geoJSONDeserializer);
		addDeserializer(Property.class, propertyDeserializer);
>>>>>>> 1ba263b821ef4efffc2b4bd3cfccee76c3a630ed
	}

	public static ActionDeserializerImpl createActionDeserializer() {
Solution content 
		super(name, version);
		actionDeserializer = createActionDeserializer();
		addDeserializer(Action.class, actionDeserializer);
		addDeserializer(Actions.class, new ActionsDeserializer(actionDeserializer));
		reactionDeserializer = createReactionDeserializer();
		geoJSONDeserializer = createGeoJSONDeserializer();
		PropertyDeserializer propertyDeserializer = new PropertyDeserializer();
		addDeserializer(Reaction.class, reactionDeserializer);
		addDeserializer(GeoJson.class, geoJSONDeserializer);
		addDeserializer(Property.class, propertyDeserializer);
	}

	public static ActionDeserializerImpl createActionDeserializer() {
File
EvrythngJacksonModuleImpl.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable