fixing

alexw668 · Dec 21, 2010 · 6bdd827 · 6bdd827
1 parent 6d3aa74
commit 6bdd827
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/config/initializers/big_tuna.rb b/config/initializers/big_tuna.rb
@@ -39,6 +39,5 @@ def self.vcses
   end
 end
 
->>>>>>> f8f1c63... Ajax calls refactored.
 Dir[File.join(Rails.root, "extras", "big_tuna", "vcs", "*.rb")].each { |vcs| require_dependency(vcs) }
 Dir[File.join(Rails.root, "extras", "big_tuna", "hooks", "*.rb")].each { |hook| require_dependency(hook) }