gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/770b5a4b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0c64c98a (commit)
	from  https://github.com/Gnucash/gnucash/commit/8ec6a4cb (commit)



commit 770b5a4be9e516260a60744d23102cf3f5c2e381
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 12 11:19:29 2023 -0700

    Add new completioncell-gnome.c to POTFILES.in

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 424659f4cd..f75681988a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -416,6 +416,7 @@ gnucash/register/register-core/table-control.c
 gnucash/register/register-core/table-layout.c
 gnucash/register/register-core/table-model.c
 gnucash/register/register-gnome/combocell-gnome.c
+gnucash/register/register-gnome/completioncell-gnome.c
 gnucash/register/register-gnome/datecell-gnome.c
 gnucash/register/register-gnome/formulacell-gnome.c
 gnucash/register/register-gnome/gnucash-color.c

commit 0c64c98a93fcb3ac6156a5e1628f79aa298080f1
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 12 11:18:11 2023 -0700

    [stock-txn-asst] Remove conflict markers.

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)
 )



Summary of changes:
 gnucash/gnome/test/CMakeLists.txt | 3 ---
 po/POTFILES.in                    | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)