From b73eab7999003ab8fba46edaee7f6fc16335a0be Mon Sep 17 00:00:00 2001
From: Dhruv Kapadia <git@dkapadia.com>
Date: Fri, 13 Aug 2010 21:21:22 -0400
Subject: [PATCH] Avoiding conflicts with rails generator

---
 app/controllers/questions_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index c3e89f6..77b4eb8 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -1,5 +1,5 @@
 require 'fastercsv'
-require 'generator'
+require 'generator.rb'
 
 class QuestionsController < InheritedResources::Base
   actions :all, :except => [ :show, :edit, :delete ]
--
libgit2 0.21.2