From 33cb3d8df0488974ea17b0d66826989b18b933fd Mon Sep 17 00:00:00 2001
From: Dominyk Tiller <dominyktiller@gmail.com>
Date: Wed, 10 Aug 2016 05:25:57 +0100
Subject: [PATCH] jena: remove samba conflict

---
 Formula/jena.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Formula/jena.rb b/Formula/jena.rb
index 39bacaeb17..cd4889eab5 100644
--- a/Formula/jena.rb
+++ b/Formula/jena.rb
@@ -14,9 +14,6 @@ class Jena < Formula
     EOS
   end
 
-  conflicts_with "samba",
-    :because => "both install `tdbbackup` and `tdbdump` binaries"
-
   def install
     rm_rf "bat" # Remove Windows scripts
 
@@ -25,7 +22,7 @@ class Jena < Formula
     libexec.install Dir["*"]
     Dir.glob("#{libexec}/bin/*") do |path|
       bin_name = File.basename(path)
-      (bin+bin_name).write shim_script(bin_name)
+      (bin/bin_name).write shim_script(bin_name)
     end
   end
 end