Projects >> framework >>f7a1ec7a220786b6a742c7cb9ed66b6ce2b6067e

Chunk
Conflicting content 
import br.gov.frameworkdemoiselle.DemoiselleException;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType;
<<<<<<< HEAD
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.FieldDetail;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.MethodDetail;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.ParameterDetail;
import br.gov.frameworkdemoiselle.internal.implementation.Management;
=======
import br.gov.frameworkdemoiselle.internal.implementation.Management;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.FieldDetail;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.MethodDetail;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.ParameterDetail;
>>>>>>> db9ebe3a4570145a9350f16053076c2c5d64072f
import br.gov.frameworkdemoiselle.management.ManagedAttributeNotFoundException;
import br.gov.frameworkdemoiselle.management.ManagedInvokationException;
import br.gov.frameworkdemoiselle.stereotype.ManagementController;
Solution content 
import br.gov.frameworkdemoiselle.DemoiselleException;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType;
import br.gov.frameworkdemoiselle.internal.implementation.Management;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.FieldDetail;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.MethodDetail;
import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.ParameterDetail;
import br.gov.frameworkdemoiselle.management.ManagedAttributeNotFoundException;
import br.gov.frameworkdemoiselle.management.ManagedInvokationException;
import br.gov.frameworkdemoiselle.stereotype.ManagementController;
File
DynamicMBeanProxy.java
Developer's decision
Version 2
Kind of conflict
Import