From f2a76a9e495303a6d7541e045fe8210941b40410 Mon Sep 17 00:00:00 2001
From: Bohdan Kapliuk <bohdan.kapliuk@gmail.com>
Date: Fri, 15 Mar 2024 00:04:38 +0200
Subject: [PATCH] 123

---
 cv4/list_ops.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cv4/list_ops.c b/cv4/list_ops.c
index d8f0726..f79e610 100644
--- a/cv4/list_ops.c
+++ b/cv4/list_ops.c
@@ -8,16 +8,12 @@ list_t *new_list(size_t length, list_element_t elements[]) {
     if (!list) {
         return NULL; 
     }
-
-<<<<<<< HEAD
-=======
+}
 list_t *new_list(size_t length, list_element_t elements[]) {
     list_t *list = malloc(sizeof(list_t) + length * sizeof(list_element_t));
     if (!list) {
         return NULL; 
     }
-
->>>>>>> eee4365d7b3f12699d8835f1641480d928f5a060
     list->length = length;
     for (size_t i = 0; i < length; i++) {
         list->elements[i] = elements[i];