Projects >> framework >>527fb0e5d70886d5305b5e95bbd921f4a70d9340

Chunk
Conflicting content 
package br.gov.frameworkdemoiselle.internal.bootstrap;

import java.util.ArrayList;
<<<<<<< HEAD
import java.util.HashMap;
=======
>>>>>>> 28dc20cfc3e537eed163d99ce1fb7dd158500e1e
import java.util.List;
import java.util.Locale;
Solution content 
package br.gov.frameworkdemoiselle.internal.bootstrap;

import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
File
CoreBootstrap.java
Developer's decision
Version 2
Kind of conflict
Import