IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[stock-txn-asst] Remove conflict markers.

Browse Source
This commit is contained in:
John Ralls 2023-06-12 11:18:11 -07:00
parent 8ec6a4cb12
commit 0c64c98a93
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnucash/gnome/test/CMakeLists.txt
View File

@ -58,12 +58,9 @@ gnc_add_test (test-assistant-stock-transaction
set_dist_list(test_gnome_DIST set_dist_list(test_gnome_DIST
CMakeLists.txt CMakeLists.txt
<<<<<<< HEAD
test-invoice-report-builtin-default.cpp test-invoice-report-builtin-default.cpp
=======
test-invoice-buitin-default.cpp test-invoice-buitin-default.cpp
${test_gnome_scheme_SOURCES} ${test_gnome_scheme_SOURCES}
${test_gnome_SOURCES} ${test_gnome_SOURCES}
${test_assistant-stock-transaction_SOURCES} ${test_assistant-stock-transaction_SOURCES}
>>>>>>> 711fe3671e (test suite for assistant-stock-transaction.cpp)
) )