Update .flayignore

bc71bbec · Zeger-Jan van de Weg · 9f7754b1 · bc71bbec
Commit bc71bbec authored Feb 06, 2018 by Zeger-Jan van de Weg
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.flayignore .flayignore +0 -3

No files found.
--- a/.flayignore
+++ b/.flayignore
@@ -11,10 +11,7 @@ app/models/concerns/relative_positioning.rb
 app/workers/stuck_merge_jobs_worker.rb
 lib/gitlab/redis/*.rb
 lib/gitlab/gitaly_client/operation_service.rb
-<<<<<<< HEAD
 app/models/project_services/packagist_service.rb
 lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb
-=======
->>>>>>> upstream/master
 lib/gitlab/background_migration/*
 app/models/project_services/kubernetes_service.rb