Merge branch 'merged-bundler' into develop

1 files changed, 0 insertions, 54 deletions

diff --git a/vendor/gems/rdoc-2.4.3/lib/rdoc/alias.rb b/vendor/gems/rdoc-2.4.3/lib/rdoc/alias.rb
deleted file mode 100644
index 74a8d4e7c..000000000
--- a/vendor/gems/rdoc-2.4.3/lib/rdoc/alias.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'rdoc/code_object'
-
-##
-# Represent an alias, which is an old_name/new_name pair associated with a
-# particular context
-
-class RDoc::Alias < RDoc::CodeObject
-
-  ##
-  # Allow comments to be overridden
-
-  attr_writer :comment
-
-  ##
-  # Aliased name
-
-  attr_accessor :new_name
-
-  ##
-  # Aliasee's name
-
-  attr_accessor :old_name
-
-  ##
-  # Source file token stream
-
-  attr_accessor :text
-
-  ##
-  # Creates a new Alias with a token stream of +text+ that aliases +old_name+
-  # to +new_name+ and has +comment+
-
-  def initialize(text, old_name, new_name, comment)
-    super()
-    @text = text
-    @old_name = old_name
-    @new_name = new_name
-    self.comment = comment
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x %s.alias_method %s, %s>" % [
-      self.class, object_id,
-      parent.name, @old_name, @new_name,
-    ]
-  end
-
-  def to_s # :nodoc:
-    "alias: #{self.old_name} -> #{self.new_name}\n#{self.comment}"
-  end
-
-end
-
-