Fixed conflict - quickjs-tart - quickjs-based runtime for wallet-core logic

commit aef4e84d3fbe27e3f479f5a8b3268df934ff944f
parent 39a232d8eecad17f0db017311d689bc216f7af87
Author: Iván Ávalos <avalos@disroot.org>
Date:   Fri,  3 Feb 2023 22:22:04 -0600

Fixed conflict

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