From 9a29a306cfd6b116a0cb696ce56bd7bc7679a8e3 Mon Sep 17 00:00:00 2001 From: Greg Nisbet Date: Wed, 10 Aug 2016 23:19:09 -0700 Subject: resolve conflict in diagnostic.rb --- Library/Homebrew/extend/os/mac/diagnostic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Library/Homebrew/extend') diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 120e5d15c..9b018bd02 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -202,7 +202,7 @@ module Homebrew SSL_CERT_DIR support was removed from Apple's curl. If fetching formulae fails you should: unset SSL_CERT_DIR - and remove it from #{shell_profile} if present. + and remove it from #{Utils::Shell.shell_profile} if present. EOS end -- cgit v1.2.3