Fix bad resolved conflict for...

Fix bad resolved conflict for app/assets/javascripts/environments/folder/environments_folder_view.js

Fix bad resolved conflict for...
Fix bad resolved conflict for app/assets/javascripts/environments/folder/environments_folder_view.js
2fde1f95 · Filipa Lacerda · 491b344a · 2fde1f95
Commit 2fde1f95 authored Apr 11, 2017 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/environments/folder/environments_folder_view.js ...vascripts/environments/folder/environments_folder_view.js +0 -3

No files found.
--- a/app/assets/javascripts/environments/folder/environments_folder_view.js
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.js
@@ -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"/>