| Chunk |
|---|
| Conflicting content |
|---|
}
return pagination;
}
<<<<<<< HEAD
=======
>>>>>>> 9e7275a1c8fe14e2d87397ea2279395ee222962b
public String prepareList() {
recreateModel();
return "List"; |
| Solution content |
|---|
}
return pagination;
}
public String prepareList() {
recreateModel();
return "List"; |
| File |
|---|
| ProductController.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |