Resolve Gemfile.lock and Gemfile.rails5.lock

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve Gemfile.lock and Gemfile.rails5.lock
Signed-off-by: Rémy Coutable <remy@rymai.me>
718f2abe · Rémy Coutable · 41f353dc · 718f2abe · 718f2abe
Commit 718f2abe authored Oct 18, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 12 deletions

Gemfile.lock Gemfile.lock +0 -6

Gemfile.rails5.lock Gemfile.rails5.lock +0 -6

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -302,10 +302,7 @@ GEM
      google-protobuf (~> 3.1)
      grpc (~> 1.10)
    github-markup (1.7.0)
-<<<<<<< HEAD
    gitlab-license (1.0.0)
-=======
->>>>>>> upstream/master
    gitlab-markup (1.6.4)
    gitlab-sidekiq-fetcher (0.3.0)
      sidekiq (~> 5)
@@ -1036,10 +1033,7 @@ DEPENDENCIES
  gettext_i18n_rails_js (~> 1.3)
  gitaly-proto (~> 0.118.1)
  github-markup (~> 1.7.0)
-<<<<<<< HEAD
  gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
  gitlab-markup (~> 1.6.4)
  gitlab-sidekiq-fetcher
  gitlab-styles (~> 2.4)

--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -305,10 +305,7 @@ GEM
      google-protobuf (~> 3.1)
      grpc (~> 1.10)
    github-markup (1.7.0)
-<<<<<<< HEAD
    gitlab-license (1.0.0)
-=======
->>>>>>> upstream/master
    gitlab-markup (1.6.4)
    gitlab-sidekiq-fetcher (0.3.0)
      sidekiq (~> 5)
@@ -1045,10 +1042,7 @@ DEPENDENCIES
  gettext_i18n_rails_js (~> 1.3)
  gitaly-proto (~> 0.118.1)
  github-markup (~> 1.7.0)
-<<<<<<< HEAD
  gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
  gitlab-markup (~> 1.6.4)
  gitlab-sidekiq-fetcher
  gitlab-styles (~> 2.4)