Fix Gemfile conflicts

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

Gemfile

@@ -403,17 +403,12 @@ gem 'health_check', '~> 2.6.0'
 gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 
-<<<<<<< HEAD
 # NTP client
 gem 'net-ntp'
 
 # SSH host key support
 gem 'net-ssh', '~> 4.1.0'
 gem 'sshkey', '~> 1.9.0'
-=======
-# SSH host key support
-gem 'net-ssh', '~> 4.1.0'
->>>>>>> upstream/master
 
 # Required for ED25519 SSH host key support
 group :ed25519 do

Gemfile.lock

@@ -503,11 +503,8 @@ GEM
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     mysql2 (0.4.5)
-    net-ldap (0.16.0)
-<<<<<<< HEAD
     net-ntp (2.1.3)
-=======
->>>>>>> upstream/master
+    net-ldap (0.16.0)
     net-ssh (4.1.0)
     netrc (0.11.0)
     nokogiri (1.6.8.1)
@@ -1035,10 +1032,7 @@ DEPENDENCIES
   grape (~> 0.19.2)
   grape-entity (~> 0.6.0)
   grape-route-helpers (~> 2.0.0)
-<<<<<<< HEAD
   gssapi
-=======
->>>>>>> upstream/master
   haml_lint (~> 0.26.0)
   hamlit (~> 2.6.1)
   hashie-forbidden_attributes
@@ -1067,10 +1061,7 @@ DEPENDENCIES
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.5)
   net-ldap
-<<<<<<< HEAD
   net-ntp
-=======
->>>>>>> upstream/master
   net-ssh (~> 4.1.0)
   nokogiri (~> 1.6.7, >= 1.6.7.2)
   oauth2 (~> 1.4)