Merge branch 'chimp-bsq-swap' into wip-merge021.10

# Conflicts:
#	desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java
This commit is contained in:
chimp1984 2021-10-21 11:26:37 +02:00
commit 080dc3e8a1
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3

View file

@ -1,6 +1,5 @@
package bisq.desktop.main.offer.bisq_v1.createoffer;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.CryptoCurrency;