<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=1449498" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/ManfredKarrer">@ManfredKarrer</a></p>
<p>Now there is a conflict. The last version of <code>desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java</code> should simply overwrite the older version.</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/3039?email_source=notifications&email_token=AJFFTNUOOYIWMC3DOGJVRCTQCHMKBA5CNFSM4IIA72VKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD3IF2FI#issuecomment-516971797">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNVFHI4LBUQCIGKCBDLQCHMKBANCNFSM4IIA72VA">mute the thread</a>.<img src="https://github.com/notifications/beacon/AJFFTNTTMOFA5IXRPWD4RQLQCHMKBA5CNFSM4IIA72VKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD3IF2FI.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/3039?email_source=notifications\u0026email_token=AJFFTNUOOYIWMC3DOGJVRCTQCHMKBA5CNFSM4IIA72VKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD3IF2FI#issuecomment-516971797",
"url": "https://github.com/bisq-network/bisq/pull/3039?email_source=notifications\u0026email_token=AJFFTNUOOYIWMC3DOGJVRCTQCHMKBA5CNFSM4IIA72VKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD3IF2FI#issuecomment-516971797",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>