Projects >> Wildbook >>55c538adbaab285e7b2a3bbe0306374d42a58940

Chunk
Conflicting content 
                                          @PathVariable("id")
                                          final String id)
    {
<<<<<<< HEAD
        Client client = Stormpath.getClient(Stormpath.propertiesPath(request));
        return SimpleFactory.getIndividual(ServletUtilities.getContext(request), client, id);
=======
        return SimpleFactory.getIndividual(ServletUtilities.getContext(request),
                                           ServletUtilities.getConfigDir(request),
                                           id);
>>>>>>> 7fb641371da4157a928a3bd77152a8a37c2d0ae2
    }
Solution content 
                                          @PathVariable("id")
                                          final String id)
    {
        return SimpleFactory.getIndividual(ServletUtilities.getContext(request),
                                           ServletUtilities.getConfigDir(request),
                                           id);
    }
File
IndividualController.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
            email = media.getEmail();

            //since this user is not logged into wildbook, we want to at least create a Stormpath user *if* one does not exist
<<<<<<< HEAD
            Client client = Stormpath.getClient(Stormpath.propertiesPath(request));
=======
            Client client = Stormpath.getClient(ServletUtilities.getConfigDir(request));
>>>>>>> 7fb641371da4157a928a3bd77152a8a37c2d0ae2
            if (client != null) {
                if (log.isDebugEnabled()) log.debug("checking on stormpath for email=" + email);
                HashMap q = new HashMap();
Solution content 
            email = media.getEmail();

            //since this user is not logged into wildbook, we want to at least create a Stormpath user *if* one does not exist
            Client client = Stormpath.getClient(ServletUtilities.getConfigDir(request));
            if (client != null) {
                if (log.isDebugEnabled()) log.debug("checking on stormpath for email=" + email);
                HashMap q = new HashMap();
File
MediaSubmissionController.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 

    //we *first* try Stormpath, and see what we get
<<<<<<< HEAD
    Client client = Stormpath.getClient(Stormpath.propertiesPath(request));
=======
    Client client = Stormpath.getClient(ServletUtilities.getConfigDir(request));
>>>>>>> 7fb641371da4157a928a3bd77152a8a37c2d0ae2
    myShepherd = new Shepherd(context);

    if (client != null) {
Solution content 

    //we *first* try Stormpath, and see what we get
    Client client = Stormpath.getClient(ServletUtilities.getConfigDir(request));
    myShepherd = new Shepherd(context);

    if (client != null) {
File
LoginUser.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable