From 091a6b8f1f192b2270eb2088ee69f4e1d11d462c Mon Sep 17 00:00:00 2001
From: Daniel Holle <dholle@hb.dhbw-stuttgart.de>
Date: Fri, 7 Jun 2024 12:16:03 +0200
Subject: [PATCH] Fix merge conflict

---
 src/test/java/TestComplete.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/TestComplete.java b/src/test/java/TestComplete.java
index 4076fede..7ca70857 100644
--- a/src/test/java/TestComplete.java
+++ b/src/test/java/TestComplete.java
@@ -1134,17 +1134,17 @@ public class TestComplete {
     }
 
     @Test
-<<<<<<< HEAD
     public void testBug337() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug337.jav");
         var clazz = classFiles.get("Bug337");
         var instance = clazz.getDeclaredConstructor().newInstance();
         clazz.getDeclaredMethod("main").invoke(instance);
-=======
+    }
+
+    @Test
     public void testBug338() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug338.jav");
         var clazz = classFiles.get("Bug338");
         var instance = clazz.getDeclaredConstructor().newInstance();
->>>>>>> ea217d16d5a1d635ac7fe961b98c2ad993c14ac5
     }
 }