Projects >> stormpath-sdk-java >>422054fd72280d80e6f19fd3b3df0bfb9cb06723

Chunk
Conflicting content 
            val = Strings.clean(request.getContextPath());
        }
        //Fix for https://github.com/stormpath/stormpath-sdk-java/issues/207
<<<<<<< HEAD
        //if (!Strings.hasText(val) || delete) {
=======
>>>>>>> af7a9b6e893decf58ce7d91bac54e4cbe5404c38
        if (!Strings.hasText(val)) {
            val = "/";
        }
Solution content 
            val = Strings.clean(request.getContextPath());
        }
        //Fix for https://github.com/stormpath/stormpath-sdk-java/issues/207
        if (!Strings.hasText(val)) {
            val = "/";
        }
File
CookieSaver.java
Developer's decision
Version 2
Kind of conflict
Comment