diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java index 190ff52bbcc4f6c9fe6c899845952e5e8c18253e..c36683c1fd3dfcdc35a4e5abc73f8bcec7d27a49 100644 --- a/src/main/java/resources/CalculatorResource.java +++ b/src/main/java/resources/CalculatorResource.java @@ -1,9 +1,5 @@ package resources; -<<<<<<< HEAD - -======= ->>>>>>> 794a6583a949557859a601f9399dfb3bbf0def40 import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path;