Fix git merge problem

2014-04-27 15:32:10 +02:00
parent e52e82fb78 59225a4b9c
commit 516ae6b68c
32 changed files with 3981 additions and 546 deletions
--- a/lib/common/models/wp_theme/findable.rb
+++ b/lib/common/models/wp_theme/findable.rb
@@ -43,8 +43,6 @@ class WpTheme < WpItem
      end
    end

-    # http://code.google.com/p/wpscan/issues/detail?id=141
-    #
    # @param [ URI ] target_uri
    #
    # @return [ WpTheme ]