1 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
index e31cac49d44..bdd6753f66a 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
@@ -428,15 +428,7 @@
     },
 
     fileTextTypePresent() {
-      let found = false;
-
-      this.state.conflictsData.files.find((f) => {
-        if (f.type === CONFLICT_TYPES.TEXT) {
-          return found = true;
-        }
-      });
-
-      return found;
+      return this.state.conflictsData.files.some(f => f.type === CONFLICT_TYPES.TEXT);
     }
   };