Fix LegacyGitHubImport::Importer conflicts

86434ef5 · Tiago Botelho · 69259d7b · 86434ef5
Commit 86434ef5 authored May 07, 2018 by Tiago Botelho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

lib/gitlab/legacy_github_import/importer.rb lib/gitlab/legacy_github_import/importer.rb +0 -4

No files found.
--- a/lib/gitlab/legacy_github_import/importer.rb
+++ b/lib/gitlab/legacy_github_import/importer.rb
@@ -79,10 +79,6 @@ module Gitlab
        return unless errors.any?
        project.ensure_import_state
-<<<<<<< HEAD
-=======
->>>>>>> upstream/master
        project.import_state&.update_column(:last_error, {
          message: 'The remote data could not be fully imported.',
          errors: errors