Merge branch 'main' of github.com:Bronku/file_sorting

2025-10-23 17:46:36 +02:00 · 2025-10-23 17:46:36 +02:00 · 7969ad60ff
commit 7969ad60ff
parent 2094cb8d92 00717dd038
1 changed files with 4 additions and 0 deletions
--- a/heap_test.c
+++ b/heap_test.c
@ -1,4 +1,8 @@
+<<<<<<< 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>