Merge pull request #18582 from ntenenz/master
authorMartin Wicke <577277+martinwicke@users.noreply.github.com>
Fri, 20 Apr 2018 00:11:18 +0000 (17:11 -0700)
committerGitHub <noreply@github.com>
Fri, 20 Apr 2018 00:11:18 +0000 (17:11 -0700)
commit904a7426de2759a6f0b5c6c6d024483a3baae71d
treec1dad2738ef1ae91a441a02eb523a0cda74a4c46
parente12f2a4f3f9b45efe102da596f31f948ac81ef99
parent3bb161433069ea5012f1f5be97fbbd8d0784213d
Merge pull request #18582 from ntenenz/master

Remove conditional scope logic now that "current_arg_scope" exists in contrib