Commit 2fde1f95 authored by Filipa Lacerda's avatar Filipa Lacerda

Fix bad resolved conflict for...

Fix bad resolved conflict for app/assets/javascripts/environments/folder/environments_folder_view.js
parent 491b344a
......@@ -169,9 +169,6 @@ export default Vue.component('environment-folder-view', {
:environments="state.environments"
:can-create-deployment="canCreateDeploymentParsed"
:can-read-environment="canReadEnvironmentParsed"
:play-icon-svg="playIconSvg"
:terminal-icon-svg="terminalIconSvg"
:commit-icon-svg="commitIconSvg"
:toggleDeployBoard="toggleDeployBoard"
:store="store"
:service="service"/>
......
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