Vue migration fix syntax highlighting.

0eb21fd8 · Fatih Acet · 78c7c11d · 0eb21fd8
Commit 0eb21fd8 authored Nov 03, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 ...javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 +1 -1

No files found.
--- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
@@ -49,7 +49,7 @@ $(() => {
          mergeConflictsStore.setLoadingState(false);

          this.$nextTick(() => {
-            $(conflictsEl.querySelectorAll('.js-syntax-highlight')).syntaxHighlight();
+            $('.js-syntax-highlight').syntaxHighlight();
          });
        });
    },