Resolve conflicts in Gemfile.lock

d0889621 · Stan Hu · ee82a41f · d0889621
Commit d0889621 authored Nov 19, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Gemfile.lock Gemfile.lock +0 -3

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -301,10 +301,7 @@ GEM
    github-markup (1.7.0)
    gitlab-default_value_for (3.1.1)
      activerecord (>= 3.2.0, < 6.0)
-<<<<<<< HEAD
    gitlab-license (1.0.0)
-=======
->>>>>>> upstream/master
    gitlab-markup (1.6.5)
    gitlab-sidekiq-fetcher (0.3.0)
      sidekiq (~> 5)