| Chunk |
|---|
| Conflicting content |
|---|
import com.gitblit.utils.HttpUtils; import com.gitblit.utils.StringUtils; import com.gitblit.utils.X509Utils.X509Metadata; <<<<<<< HEAD import com.gitblit.wicket.GitBlitWebSession; import com.google.inject.Inject; import com.google.inject.Singleton; ======= >>>>>>> efdb2b3d0c6f03a9aac9e65892cbc8ff755f246f /** * The authentication manager handles user login & logout. |
| Solution content |
|---|
import com.gitblit.utils.HttpUtils; import com.gitblit.utils.StringUtils; import com.gitblit.utils.X509Utils.X509Metadata; import com.google.inject.Inject; import com.google.inject.Singleton; /** * The authentication manager handles user login & logout. |
| File |
|---|
| AuthenticationManager.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |