Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-27 02:52:14 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(fe): merge conflict

Browse Source
This commit is contained in:
Denis Gukov 2022-09-09 22:37:28 +05:00
parent 3c1191b391
commit 9c525789e3
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
web2/src/components/RepositoryForm.vue
View File

@ -41,43 +41,8 @@
:color="type ===x ? 'primary' : ''"
@click="setType(x)"
style="font-weight: bold;"
<<<<<<< HEAD
:key="x"
>{{ x }}</v-chip>
=======
>
file
</v-chip>
<v-chip
x-small
class="ml-1"
:color="type ==='git' ? 'primary' : ''"
@click="setType('git')"
style="font-weight: bold;"
>
git
</v-chip>
<v-chip
x-small
class="ml-1"
:color="type ==='ssh' ? 'primary' : ''"
@click="setType('ssh')"
style="font-weight: bold;"
>
ssh
</v-chip>
<v-chip
x-small
class="ml-1"
:color="type ==='https' ? 'primary' : ''"
@click="setType('https')"
style="font-weight: bold;"
>
https
</v-chip>
>>>>>>> f02c260e3509fb17a3b23f24fb62d16cd7fb6493
<span class="caption ml-3">local:</span>
<v-chip
x-small