Fix .flayignore

02331173 · Jacob Vosmaer · 77901c1f · 02331173
Commit 02331173 authored Mar 29, 2018 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.flayignore .flayignore +0 -3

No files found.
--- a/.flayignore
+++ b/.flayignore
@@ -16,11 +16,8 @@ lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb
 lib/gitlab/background_migration/*
 app/models/project_services/kubernetes_service.rb
 lib/gitlab/workhorse.rb
-<<<<<<< HEAD

 ee/db/**/*
 ee/app/serializers/ee/merge_request_widget_entity.rb
 ee/lib/ee/gitlab/ldap/sync/admin_users.rb
 ee/spec/**/*
-=======
->>>>>>> upstream/master