sdformat8 doesn't conflict with any other sdformat

osrf · Nov 16, 2019 · 92ea5c1 · 92ea5c1
1 parent f5044fd
commit 92ea5c1
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 11 deletions.
diff --git a/Formula/sdformat4.rb b/Formula/sdformat4.rb
@@ -28,7 +28,6 @@ class Sdformat4 < Formula
   conflicts_with "sdformat5", :because => "Differing version of the same formula"
   conflicts_with "sdformat6", :because => "Differing version of the same formula"
   conflicts_with "sdformat7", :because => "Differing version of the same formula"
-  conflicts_with "sdformat8", :because => "Differing version of the same formula"
 
   def install
     ENV.m64

diff --git a/Formula/sdformat5.rb b/Formula/sdformat5.rb
@@ -28,7 +28,6 @@ class Sdformat5 < Formula
   conflicts_with "sdformat4", :because => "Differing version of the same formula"
   conflicts_with "sdformat6", :because => "Differing version of the same formula"
   conflicts_with "sdformat7", :because => "Differing version of the same formula"
-  conflicts_with "sdformat8", :because => "Differing version of the same formula"
 
   def install
     ENV.m64

diff --git a/Formula/sdformat6.rb b/Formula/sdformat6.rb
@@ -29,7 +29,6 @@ class Sdformat6 < Formula
   conflicts_with "sdformat4", :because => "Differing version of the same formula"
   conflicts_with "sdformat5", :because => "Differing version of the same formula"
   conflicts_with "sdformat7", :because => "Differing version of the same formula"
-  conflicts_with "sdformat8", :because => "Differing version of the same formula"
 
   def install
     ENV.m64

diff --git a/Formula/sdformat7.rb b/Formula/sdformat7.rb
@@ -29,7 +29,6 @@ class Sdformat7 < Formula
   conflicts_with "sdformat4", :because => "Differing version of the same formula"
   conflicts_with "sdformat5", :because => "Differing version of the same formula"
   conflicts_with "sdformat6", :because => "Differing version of the same formula"
-  conflicts_with "sdformat8", :because => "Differing version of the same formula"
 
   def install
     ENV.m64

diff --git a/Formula/sdformat8.rb b/Formula/sdformat8.rb
@@ -19,13 +19,6 @@ class Sdformat8 < Formula
   depends_on "tinyxml"
   depends_on "urdfdom" => :optional
 
-  conflicts_with "sdformat", :because => "Differing version of the same formula"
-  conflicts_with "sdformat3", :because => "Differing version of the same formula"
-  conflicts_with "sdformat4", :because => "Differing version of the same formula"
-  conflicts_with "sdformat5", :because => "Differing version of the same formula"
-  conflicts_with "sdformat6", :because => "Differing version of the same formula"
-  conflicts_with "sdformat7", :because => "Differing version of the same formula"
-
   def install
     ENV.m64