Resolve conflicts in app/helpers/environments_helper.rb

40c94334 · Stan Hu · 4df85e57 · 40c94334
Commit 40c94334 authored Jul 26, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/helpers/environments_helper.rb app/helpers/environments_helper.rb +0 -3

No files found.
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -11,10 +11,7 @@ module EnvironmentsHelper
    {
      "settings-path" => edit_project_service_path(project, 'prometheus'),
      "clusters-path" => project_clusters_path(project),
-<<<<<<< HEAD
-=======
      "current-environment-name": environment.name,
->>>>>>> upstream/master
      "documentation-path" => help_page_path('administration/monitoring/prometheus/index.md'),
      "empty-getting-started-svg-path" => image_path('illustrations/monitoring/getting_started.svg'),
      "empty-loading-svg-path" => image_path('illustrations/monitoring/loading.svg'),