From 6f4dc6b4db7ce790a61982cada2af94bd913f376 Mon Sep 17 00:00:00 2001
From: Anna Schiedner <anna@schiedner.de>
Date: Fri, 22 Apr 2022 20:53:29 +0200
Subject: [PATCH] Fehler behoben

---
 ArrayManipulation.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ArrayManipulation.java b/ArrayManipulation.java
index c36b16d..af328d7 100644
--- a/ArrayManipulation.java
+++ b/ArrayManipulation.java
@@ -17,13 +17,8 @@ public class ArrayManipulation {
     }
     public static void main(String[] args) {
        
-<<<<<<< HEAD
-        int[] arr = {1,2,3,4,5};
-        System.out.println(Arrays.toString(reverseArray(arr, "Hannah")));
-=======
         int[] arr = {1,2,3,4,5,8};
         System.out.println(Arrays.toString(reverseArray(arr)));
->>>>>>> 471ac3d389e5c3eabdfb385a6ad08f94a8b97c3b
         
     }
     public static int[] removeFirst(int[] arr) {