diff options
| -rw-r--r-- | lib/gitlab/background_migration/populate_fork_networks_range.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/gitlab/background_migration/populate_fork_networks_range.rb b/lib/gitlab/background_migration/populate_fork_networks_range.rb index e96420c3fd7..a976cb4c243 100644 --- a/lib/gitlab/background_migration/populate_fork_networks_range.rb +++ b/lib/gitlab/background_migration/populate_fork_networks_range.rb @@ -1,8 +1,5 @@ -<<<<<<< HEAD -======= # frozen_string_literal: true ->>>>>>> 552c908930... Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master' module Gitlab module BackgroundMigration # This background migration is going to create all `fork_networks` and |