Fix merge conflicts for Anastasis branch - quickjs-tart - quickjs-based runtime for wallet-core logic

commit 0dab51c9dbb78b010f0226a76b1144574091bea0
parent 370bc24d1614018a8c255319472dfe3502244022
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 26 Jul 2023 12:02:55 -0600

Fix merge conflicts for Anastasis branch

	quickjs-tart quickjs-based runtime for wallet-core logic
	Log \| Files \| Refs \| README \| LICENSE