From 271eedd37cb82ed391b6772fa6fbebd7cc60ec3a Mon Sep 17 00:00:00 2001 From: Jonas Date: Fri, 5 Dec 2025 14:48:11 +0100 Subject: [PATCH] stackTest small fix --- I2_Dobble/stackTest.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/I2_Dobble/stackTest.c b/I2_Dobble/stackTest.c index 1972701..71d8b66 100644 --- a/I2_Dobble/stackTest.c +++ b/I2_Dobble/stackTest.c @@ -233,9 +233,6 @@ int main() { UNITY_BEGIN(); -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD printf("\n============================\n Stack tests\n============================\n"); printf("-> Create Nodes (push)\n"); RUN_TEST(test_createNodeAbortsOnZeroData); @@ -251,11 +248,6 @@ int main() RUN_TEST(test_outputTopFailsOnZero); RUN_TEST(test_outputTopCorrect); -======= ->>>>>>> 0c075ea (stackTest file added) -======= -======= ->>>>>>> ef8340ba6b9e7a4d6bac8d0eb9b4b987a9316088 RUN_TEST(test_push_should_add_new_node_at_top); RUN_TEST(test_push_multiple_should_chain_nodes_correctly); RUN_TEST(test_top_should_return_null_on_empty_stack); @@ -264,9 +256,5 @@ int main() RUN_TEST(test_pop_should_remove_single_element); RUN_TEST(test_pop_should_remove_top_node_only); -<<<<<<< HEAD ->>>>>>> 0d561c0 (added stackTest) -======= ->>>>>>> ef8340ba6b9e7a4d6bac8d0eb9b4b987a9316088 return UNITY_END(); } \ No newline at end of file