| Chunk |
|---|
| Conflicting content |
|---|
log.debug("Setting feed state to logged out");
updateFeedStateListeners(FeedState.LOGGED_OUT);
<<<<<<< HEAD
=======
loggingIn = false;
}else if(event == DDF_FeedEvent.LINK_DISCONNECT){
loggingIn = false;
>>>>>>> d1987811794fbed1e0951b4b4447ca207fe63cfd
}
log.debug("Enacting policy for :{}", event.name()); |
| Solution content |
|---|
log.debug("Setting feed state to logged out");
updateFeedStateListeners(FeedState.LOGGED_OUT);
}
log.debug("Enacting policy for :{}", event.name()); |
| File |
|---|
| FeedClientDDF.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| If statement |