Projects >> stormpath-sdk-java >>1ab349d119a0a4a3ebc8d2f095a4ad616fa430fb

Chunk
Conflicting content 
/*
<<<<<<< HEAD
=======
 * Copyright 2014 Stormpath, Inc.
>>>>>>> b227d3c9105c1dcc1cf01879dca942947a8a0d4f
 *
 *  * Copyright 2014 Stormpath, Inc.
 *  *
Solution content 
/*
 * Copyright 2014 Stormpath, Inc.
 *
File
Application.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
/*
<<<<<<< HEAD
=======
 * Copyright 2014 Stormpath, Inc.
>>>>>>> b227d3c9105c1dcc1cf01879dca942947a8a0d4f
 *
 *  * Copyright 2014 Stormpath, Inc.
 *  *
Solution content 
/*
 * Copyright 2014 Stormpath, Inc.
 *
File
DefaultApplication.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

<<<<<<< HEAD
import java.lang.reflect.Constructor;
import java.util.HashSet;
=======
import java.util.HashMap;
>>>>>>> b227d3c9105c1dcc1cf01879dca942947a8a0d4f
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
Solution content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.lang.reflect.Constructor;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
File
DefaultApplication.java
Developer's decision
Version 1
Kind of conflict
Import