Projects >> structr >>f140c2dae4d8161b098479eaa25d584a017c163c

Chunk
Conflicting content 
			do {
				serializer = serializers.get(localType);
<<<<<<< HEAD
				
=======

>>>>>>> 4f22e20077706b048d3b9174af60a4fd16ac1fba
				if (serializer == null) {

					Set interfaces = new LinkedHashSet();
Solution content 
			do {
				serializer = serializers.get(localType);
				
				if (serializer == null) {

					Set interfaces = new LinkedHashSet();
File
GraphObjectGSONAdapter.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
						}
					}
				}
<<<<<<< HEAD
				
				localType = localType.getSuperclass();

			} while (serializer == null && !localType.equals(Object.class));

=======

				localType = localType.getSuperclass();

			} while (serializer == null && !localType.equals(Object.class));
>>>>>>> 4f22e20077706b048d3b9174af60a4fd16ac1fba
			
			// cache found serializer
			if (serializer != null) {
Solution content 
						}
					}
				}
				
				localType = localType.getSuperclass();

			} while (serializer == null && !localType.equals(Object.class));
			
			
			// cache found serializer
			if (serializer != null) {
File
GraphObjectGSONAdapter.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable