Fix extra newline left by conflict resolution

af284655 · DJ Mountney · c1b1a1fb · af284655
Commit af284655 authored Jun 28, 2019 by DJ Mountney
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

lib/gitlab/database.rb lib/gitlab/database.rb +0 -1

No files found.
--- 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