github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(docker/container): remove git conflicts

pull/10348/head
Chaim Lev-Ari 2023-09-25 19:41:20 +03:00
parent 3c095c172b
commit 9cc2f0b582
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/docker/views/containers/create/createcontainer.html
View File

@ -222,12 +222,7 @@
<div class="tab-pane" id="network">
<docker-create-container-network-tab values="formValues.network" on-change="(onNetworkChange)"> </docker-create-container-network-tab>
</div>
<<<<<<< HEAD
<!-- tab-labels -->
=======
<!-- !tab-network -->
>>>>>>> 26033115c (feat(containers): migrate labels tab to react [EE-5212])
<div class="tab-pane" id="labels">
<docker-create-container-labels-tab values="formValues.labels" on-change="(onLabelsChange)"></docker-create-container-labels-tab>
</div>