<p>I've rebased onto master. (The conflict in <code>AvoidStandbyModeService</code> was caused by imports and a move from <code>BisqEnvironment.getAppDataDir()</code> to <code>config.appDataDir</code>.)</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/3909?email_source=notifications&email_token=AJFFTNX3O5Z2VLGNJKWBJLTQ7AL4LA5CNFSM4KI4APB2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJS7ZTA#issuecomment-577109196">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQJNA437M5PREKRNGDQ7AL4LANCNFSM4KI4APBQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNSVI2XHMMQKZHNMMCLQ7AL4LA5CNFSM4KI4APB2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJS7ZTA.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/3909?email_source=notifications\u0026email_token=AJFFTNX3O5Z2VLGNJKWBJLTQ7AL4LA5CNFSM4KI4APB2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJS7ZTA#issuecomment-577109196",
"url": "https://github.com/bisq-network/bisq/pull/3909?email_source=notifications\u0026email_token=AJFFTNX3O5Z2VLGNJKWBJLTQ7AL4LA5CNFSM4KI4APB2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJS7ZTA#issuecomment-577109196",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>