| Chunk |
|---|
| Conflicting content |
|---|
session.setAttribute("account", account);
if (DBOperation.isVendor(email) ) {
<<<<<<< HEAD
request.getRequestDispatcher("/page_vendorHome.jsp").forward(request, response);
=======
request.getRequestDispatcher("/page_vendor.jsp").forward(request, response);
>>>>>>> 14c31c60eee6f3eabf13621385ebe3115956a275
}
else {
request.getRequestDispatcher("/page_home.jsp").forward(request, response); |
| Solution content |
|---|
session.setAttribute("account", account);
if (DBOperation.isVendor(email) ) {
request.getRequestDispatcher("/page_vendor.jsp").forward(request, response);
}
else {
request.getRequestDispatcher("/page_home.jsp").forward(request, response); |
| File |
|---|
| VerifyLogin.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |