diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-12-14 10:47:11 +0100 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-12-14 12:16:10 +0100 |
| commit | 5708bd6c70b2964a838369a35c3545c470f6d22a (patch) | |
| tree | c749a6f040941ccdb38d7afc6f5341a2f839a73e | |
| parent | 341f953b586b2ac7822cdc217dab4dd0c9dbf068 (diff) | |
| download | gitlab-ce-5708bd6c70b2964a838369a35c3545c470f6d22a.tar.gz | |
Resolve conflicts in `populate_fork_networks_range.rb`
| -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 |