From 0448d78fc54f265c72b824daf1de2608be983124 Mon Sep 17 00:00:00 2001
From: bronku <bronk.jakub@proton.me>
Date: Thu, 23 Oct 2025 17:47:00 +0200
Subject: [PATCH] ok

---
 heap_test.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/heap_test.c b/heap_test.c
index ebbe73c..2769954 100644
--- a/heap_test.c
+++ b/heap_test.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 // the tests are ai generated, with prompt based on the heap.h file
-=======
-// the tests are ai generated
->>>>>>> 00717dd038b2c024b529553b5c2a848fceccf2fb
 #include "heap.h"
 #include <assert.h>
 #include <stdio.h>