1 files changed, 9 insertions, 9 deletions
diff --git a/app/views/projects/merge_requests/conflicts.html.haml b/app/views/projects/merge_requests/conflicts.html.haml
index 16789f68f70..b8b87dcdcaf 100644
--- a/app/views/projects/merge_requests/conflicts.html.haml
+++ b/app/views/projects/merge_requests/conflicts.html.haml
@@ -9,29 +9,29 @@
 
 = render 'shared/issuable/sidebar', issuable: @merge_request
 
-#conflicts{"v-cloak" => "true", data: { conflicts_path: conflicts_namespace_project_merge_request_path(@merge_request.project.namespace, @merge_request.project, @merge_request, format: :json),
+#conflicts{ "v-cloak" => "true", data: { conflicts_path: conflicts_namespace_project_merge_request_path(@merge_request.project.namespace, @merge_request.project, @merge_request, format: :json),
     resolve_conflicts_path: resolve_conflicts_namespace_project_merge_request_path(@merge_request.project.namespace, @merge_request.project, @merge_request) } }
-  .loading{"v-if" => "isLoading"}
+  .loading{ "v-if" => "isLoading" }
     %i.fa.fa-spinner.fa-spin
 
-  .nothing-here-block{"v-if" => "hasError"}
+  .nothing-here-block{ "v-if" => "hasError" }
     {{conflictsData.errorMessage}}
 
   = render partial: "projects/merge_requests/conflicts/commit_stats"
 
-  .files-wrapper{"v-if" => "!isLoading && !hasError"}
+  .files-wrapper{ "v-if" => "!isLoading && !hasError" }
     .files
-      .diff-file.file-holder.conflict{"v-for" => "file in conflictsData.files"}
+      .diff-file.file-holder.conflict{ "v-for" => "file in conflictsData.files" }
         .file-title
-          %i.fa.fa-fw{":class" => "file.iconClass"}
+          %i.fa.fa-fw{ ":class" => "file.iconClass" }
           %strong {{file.filePath}}
           = render partial: 'projects/merge_requests/conflicts/file_actions'
         .diff-content.diff-wrap-lines
-          .diff-wrap-lines.code.file-content.js-syntax-highlight{"v-show" => "!isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
+          .diff-wrap-lines.code.file-content.js-syntax-highlight{ "v-show" => "!isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
             = render partial: "projects/merge_requests/conflicts/components/inline_conflict_lines"
-          .diff-wrap-lines.code.file-content.js-syntax-highlight{"v-show" => "isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
+          .diff-wrap-lines.code.file-content.js-syntax-highlight{ "v-show" => "isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
             %parallel-conflict-lines{ ":file" => "file" }
-          %div{"v-show" => "file.resolveMode === 'edit' ||  file.type === 'text-editor'"}
+          %div{ "v-show" => "file.resolveMode === 'edit' ||  file.type === 'text-editor'" }
             = render partial: "projects/merge_requests/conflicts/components/diff_file_editor"
 
     = render partial: "projects/merge_requests/conflicts/submit_form"