From a3a6af9d99141160dad21ff8f04e9fdcacd274f4 Mon Sep 17 00:00:00 2001
From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
Date: Fri, 26 Mar 2021 19:18:48 +0000
Subject: [PATCH] cmd/list: remove cask and ls flag conflicts

---
 Library/Homebrew/cmd/list.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index a66a8a2aa1..4132d9bf16 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -57,6 +57,7 @@ module Homebrew
       conflicts "--formula", "--cask"
       conflicts "--full-name", "--versions"
       conflicts "--pinned", "--multiple"
+      conflicts "--pinned", "--cask"
       conflicts "--cask", "--multiple"
       ["--formula", "--cask", "--full-name", "--versions", "--pinned"].each do |flag|
         conflicts "--unbrewed", flag
@@ -68,7 +69,6 @@ module Homebrew
       end
       ["--pinned", "-l", "-r", "-t"].each do |flag|
         conflicts "--full-name", flag
-        conflicts "--cask", flag
       end
 
       named_args [:installed_formula, :installed_cask]