Skip to content

G
gitlab-ce
Commit 48d5e55d authored by Jose Vargas's avatar Jose Vargas
Browse files
Options

fix environment_item conflicts

parent 837f14a1
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
app/assets/javascripts/environments/components/environment_item.vue
View file @ 48d5e55d
...@@ -479,7 +479,6 @@ export default { ...@@ -479,7 +479,6 @@ export default {
{{ s__("Environments|Environment") }} {{ s__("Environments|Environment") }}
</div> </div>
<span <span
<<<<<<< HEAD
v-if="model.hasDeployBoard" v-if="model.hasDeployBoard"
class="deploy-board-icon" class="deploy-board-icon"
@click="toggleDeployBoard"> @click="toggleDeployBoard">
...@@ -496,9 +495,7 @@ export default { ...@@ -496,9 +495,7 @@ export default {
aria-hidden="true"> aria-hidden="true">
</i> </i>
</span> </span>
<a <span
=======
>>>>>>> upstream/master
v-if="!model.isFolder" v-if="!model.isFolder"
class="environment-name table-mobile-content"> class="environment-name table-mobile-content">
<a <a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7