🐞 fixed merge conflict errors
All checks were successful
continuous-integration/drone/push Build is passing

ref #13 #12
This commit is contained in:
2021-01-26 18:25:30 +01:00
parent 9a1f7a13f8
commit cbc1d53cc2
5 changed files with 12 additions and 3 deletions

View File

@@ -72,6 +72,7 @@
on:cancelDelete={(event) => {
import_modal_open = false;
}}
passed_team={{}}
passed_orgs={[]}
passed_org={orgdata}
opened_from="OrgDetail"

View File

@@ -43,6 +43,7 @@
on:cancelDelete={(event) => {
import_modal_open = false;
}}
passed_team={{}}
passed_org={{}}
passed_orgs={current_organizations}
opened_from="OrgOverview"

View File

@@ -69,7 +69,7 @@
</script>
{#await runner_promise}
<!-- -->
{$_('loading-runners')}
{:then}
<section class="container p-5 select-none">
<div class="flex flex-row mb-4">