From af28465556c71428f865d1062bbb3931d7d9daff Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Fri, 28 Jun 2019 16:28:45 +0000
Subject: Fix extra newline left by conflict resolution

---
 lib/gitlab/database.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index a9aa0bb36f2..34c1e6ad8ca 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -22,7 +22,6 @@ module Gitlab
       docstring "Time spent in database transactions, in seconds"
     end
 
-
     def self.config
       ActiveRecord::Base.configurations[Rails.env]
     end
-- 
cgit v1.2.1