Projects >> jackson-databind >>d58eec63be1ee8e7e236bbded38c73343d9bb22b

Chunk
Conflicting content 
package com.fasterxml.jackson.databind.type;

import java.lang.reflect.Method;
<<<<<<< HEAD
=======
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
>>>>>>> cb6717764c0460f560e1b09478faa4dac692e8f3

import com.fasterxml.jackson.databind.BaseMapTest;
import com.fasterxml.jackson.databind.JavaType;
Solution content 
package com.fasterxml.jackson.databind.type;

import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;

import com.fasterxml.jackson.databind.BaseMapTest;
import com.fasterxml.jackson.databind.JavaType;
File
TestJavaType.java
Developer's decision
Version 2
Kind of conflict
Import