Fix payment request merge conflict marker in UI

This commit is contained in:
Kukks 2023-04-26 14:06:23 +02:00
parent b0396df33f
commit 92d9c17095
No known key found for this signature in database
GPG Key ID: 8E5530D9D1C93097

View File

@ -86,7 +86,7 @@
<label asp-for="Email" class="form-label"></label>
<input type="email" asp-for="Email" placeholder="Firstname Lastname <email@example.com>" class="form-control" />
<span asp-validation-for="Email" class="text-danger"></span>
+ <div id="PaymentRequestEmailHelpBlock" class="form-text">The recipient's email. This will send notification mails to the recipient, as configured by the <a asp-action="StoreEmails" asp-controller="UIStores" asp-route-storeId="@Model.StoreId">email rules</a>, and include the email in the invoice export data.</div>
<div id="PaymentRequestEmailHelpBlock" class="form-text">The recipient's email. This will send notification mails to the recipient, as configured by the <a asp-action="StoreEmails" asp-controller="UIStores" asp-route-storeId="@Model.StoreId">email rules</a>, and include the email in the invoice export data.</div>
</div>
<div class="form-group">
<label asp-for="FormId" class="form-label"></label>