1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
index 5bae6d63df6..827cf5f478d 100644
--- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
+++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
@@ -8,9 +8,12 @@ import utilsMixin from '../mixins/line_conflict_utils';
   global.mergeConflicts = global.mergeConflicts || {};
 
   global.mergeConflicts.inlineConflictLines = Vue.extend({
+    mixins: [utilsMixin, actionsMixin],
     props: {
-      file: Object,
+      file: {
+        type: Object,
+        required: true,
+      },
     },
-    mixins: [utilsMixin, actionsMixin],
   });
 })(window.gl || (window.gl = {}));