From 0e786e30673f7ab0ea356bdf89f81f43e936432f Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 27 Jun 2016 19:44:15 +0300
Subject: [PATCH] Fix conflict resolving in Gemfile.lock
---
Gemfile.lock | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Gemfile.lock b/Gemfile.lock
index eec5b8883291d..fa1d9850cbd31 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -342,6 +342,8 @@ GEM
grape-entity (0.4.8)
activesupport
multi_json (>= 1.3.2)
+ gssapi (1.2.0)
+ ffi (>= 1.0.1)
hamlit (2.5.0)
temple (~> 0.7.6)
thor
@@ -903,6 +905,7 @@ DEPENDENCIES
gon (~> 6.0.1)
grape (~> 0.13.0)
grape-entity (~> 0.4.2)
+ gssapi
hamlit (~> 2.5)
health_check (~> 1.5.1)
hipchat (~> 1.5.0)
--
GitLab