merge conflicts resolved

[redis.git] / utils / generate-command-help.rb

diff --git a/utils/generate-command-help.rb b/utils/generate-command-help.rb
index f730eaf10092ee781dd1e238d299a2883b95a4ba..96cccc2bfbc1a8e0be5cb4379c48c434068a1fde 100755 (executable)
--- a/utils/generate-command-help.rb
+++ b/utils/generate-command-help.rb
@@ -42,6 +42,7 @@ end
 def commands
   return @commands if @commands
 
+  require "rubygems"
   require "net/http"
   require "net/https"
   require "json"