Resolve Gemfile.lock and README.md

837df4c8 · Lin Jen-Shin · 69d49403 · 837df4c8 · 837df4c8
Commit 837df4c8 authored Sep 08, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

Gemfile.lock Gemfile.lock +0 -3

README.md README.md +0 -5

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1073,11 +1073,8 @@ DEPENDENCIES
  grape (~> 1.0)
  grape-entity (~> 0.6.0)
  grape-route-helpers (~> 2.1.0)
-<<<<<<< HEAD
  gssapi
-=======
  grape_logging (~> 1.6)
->>>>>>> upstream/master
  haml_lint (~> 0.26.0)
  hamlit (~> 2.6.1)
  hashie-forbidden_attributes

--- a/README.md
+++ b/README.md
 # GitLab
-<<<<<<< HEAD
 [![Build status](https://gitlab.com/gitlab-org/gitlab-ee/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ee/commits/master)
 [![Overall test coverage](https://gitlab.com/gitlab-org/gitlab-ee/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-ee/pipelines)
-=======
-[![Build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
-[![Overall test coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-ce/pipelines)
 [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.svg)](https://gemnasium.com/gitlabhq/gitlabhq)
->>>>>>> upstream/master
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
 [![Core Infrastructure Initiative Best Practices](https://bestpractices.coreinfrastructure.org/projects/42/badge)](https://bestpractices.coreinfrastructure.org/projects/42)
 [![Gitter](https://badges.gitter.im/gitlabhq/gitlabhq.svg)](https://gitter.im/gitlabhq/gitlabhq?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)