Resolve "Refactor Methods in RequestTableService"
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -37,6 +37,7 @@ import nl.tudelft.queue.model.LabRequest;
@@ -37,6 +37,7 @@ import nl.tudelft.queue.model.LabRequest;
@@ -45,6 +46,8 @@ public class EditionStatusController {
@@ -45,6 +46,8 @@ public class EditionStatusController {
* Creates and returns the data for a histogram regarding the status of requests over time. The data for
@@ -134,7 +137,7 @@ public class EditionStatusController {
@@ -134,7 +137,7 @@ public class EditionStatusController {
@@ -160,7 +163,7 @@ public class EditionStatusController {
@@ -160,7 +163,7 @@ public class EditionStatusController {