From 26603b7439c10ce789d2d62fda5ca0d56153e978 Mon Sep 17 00:00:00 2001
From: Martin Dolmen Helmersen <marthelm@stud.ntnu.no>
Date: Tue, 9 Mar 2021 10:05:04 +0100
Subject: [PATCH] Removed unexpected token

---
 src/main/java/resources/CalculatorResource.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java
index 4720277..5712a79 100644
--- a/src/main/java/resources/CalculatorResource.java
+++ b/src/main/java/resources/CalculatorResource.java
@@ -1,9 +1,5 @@
 package resources;
 
-<<<<<<< HEAD
-import org.graalvm.compiler.hotspot.stubs.DivisionByZeroExceptionStub;
-=======
->>>>>>> 2ffc5ca1cddf44a1e6d380f18eb4b10bb4578efb
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
-- 
GitLab