🐞 fixed merge conflict errors
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
ref #13 #12
This commit is contained in:
@@ -72,6 +72,7 @@
|
||||
on:cancelDelete={(event) => {
|
||||
import_modal_open = false;
|
||||
}}
|
||||
passed_team={{}}
|
||||
passed_orgs={[]}
|
||||
passed_org={orgdata}
|
||||
opened_from="OrgDetail"
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
on:cancelDelete={(event) => {
|
||||
import_modal_open = false;
|
||||
}}
|
||||
passed_team={{}}
|
||||
passed_org={{}}
|
||||
passed_orgs={current_organizations}
|
||||
opened_from="OrgOverview"
|
||||
|
||||
@@ -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">
|
||||
|
||||
Reference in New Issue
Block a user