diff options
| author | Greg Nisbet | 2016-08-10 23:19:09 -0700 |
|---|---|---|
| committer | Greg Nisbet | 2016-08-10 23:19:09 -0700 |
| commit | 9a29a306cfd6b116a0cb696ce56bd7bc7679a8e3 (patch) | |
| tree | 19eefeaea0baf5c39e2ea0795d2774ae852a8022 /Library/Homebrew/extend | |
| parent | 06fe347de97975dc01e726f87bf07a56a6fb713e (diff) | |
| download | brew-9a29a306cfd6b116a0cb696ce56bd7bc7679a8e3.tar.bz2 | |
resolve conflict in diagnostic.rb
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/os/mac/diagnostic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |