Resolve merge conflict.

airblade · Jan 11, 2010 · 6153db0 · 6153db0
2 parents 30c0f11 + 7153f9d
commit 6153db0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/fyi.rb b/lib/fyi.rb
@@ -41,7 +41,7 @@ def run_failed output, error
   end
 
   def notify result, duration, output, error = ''
-    host = `hostname` || 'unknown'
+    host = `hostname`
     notifiers.each do |notifier|
       notifier.notify @command, result, duration, output, error, host
     end