From 0c64c98a93fcb3ac6156a5e1628f79aa298080f1 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 12 Jun 2023 11:18:11 -0700 Subject: [PATCH] [stock-txn-asst] Remove conflict markers. --- gnucash/gnome/test/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnucash/gnome/test/CMakeLists.txt b/gnucash/gnome/test/CMakeLists.txt index 81b77a8c16..4e8caea2c4 100644 --- a/gnucash/gnome/test/CMakeLists.txt +++ b/gnucash/gnome/test/CMakeLists.txt @@ -58,12 +58,9 @@ gnc_add_test (test-assistant-stock-transaction set_dist_list(test_gnome_DIST CMakeLists.txt -<<<<<<< HEAD test-invoice-report-builtin-default.cpp -======= test-invoice-buitin-default.cpp ${test_gnome_scheme_SOURCES} ${test_gnome_SOURCES} ${test_assistant-stock-transaction_SOURCES} ->>>>>>> 711fe3671e (test suite for assistant-stock-transaction.cpp) )