Resolve conflicts in `populate_fork_networks_range.rb`

5708bd6c · Bob Van Landuyt · Winnie Hellmann · 341f953b · 5708bd6c
Commit 5708bd6c authored Dec 14, 2017 by Bob Van Landuyt Committed by Winnie Hellmann Dec 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

populate_fork_networks_range.rb ...tlab/background_migration/populate_fork_networks_range.rb +0 -3

No files found.
--- a/lib/gitlab/background_migration/populate_fork_networks_range.rb
+++ b/lib/gitlab/background_migration/populate_fork_networks_range.rb
-<<<<<<< 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