From: Ben Beltran <redacted>
Date: Thu, 13 Nov 2014 23:19:58 +0000 (-0700)
Subject: Merge branch 'master' of github.com:benbeltran/lyricli
X-Git-Url: https://git.r.bdr.sh/rbdr/lyricli.rb/commitdiff_plain/a1f64790dc2a69580dc73022686e6806b6bf7349?hp=4c4cd954eea5f2d00e32be1b91790b5cf5551551

Merge branch 'master' of github.com:benbeltran/lyricli
---

diff --git a/bin/lrc b/bin/lrc
index b1a44b6..3f71d87 100755
--- a/bin/lrc
+++ b/bin/lrc
@@ -3,8 +3,6 @@
 require 'optparse'
 require 'lyricli'
 
-
-options = {}
 OptionParser.new do |opts|
     opts.banner = %{Usage:
     lrc [options]
diff --git a/lib/lyricli/configuration.rb b/lib/lyricli/configuration.rb
index 811526b..53a3e2b 100644
--- a/lib/lyricli/configuration.rb
+++ b/lib/lyricli/configuration.rb
@@ -56,7 +56,7 @@ module Lyricli
     def load_config
       path = File.expand_path(@config_path)
 
-      if File.exists?(path)
+      if File.exist?(path)
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else
@@ -79,7 +79,7 @@ module Lyricli
       # Load the default
       path = File.join(::Lyricli.root, "config", @defaults_path)
 
-      if File.exists?(path)
+      if File.exist?(path)
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else