Skip to content
Snippets Groups Projects
Commit ccb2c45c authored by Paul-Christian Volkmer's avatar Paul-Christian Volkmer
Browse files

Fixed null pointer dereference

parent 93190e50
Branches
Tags
No related merge requests found
......@@ -122,7 +122,7 @@ public class LoggedIn {
}
public boolean hasConflicts() {
return ! (_conflicts == null && _conflicts.isEmpty());
return ! (_conflicts == null || _conflicts.isEmpty());
}
@Override
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment