Merge remote-tracking branch 'upstream/master' into routing

[rails.git] / db / migrate / 018_create_acls.rb

diff --git a/db/migrate/018_create_acls.rb b/db/migrate/018_create_acls.rb
index d82020892eca9863391da5da324768220f926712..08ed4f7316b8b9fad91873b7d0c067c91e0d5373 100644 (file)
--- a/db/migrate/018_create_acls.rb
+++ b/db/migrate/018_create_acls.rb
@@ -1,4 +1,4 @@
-require 'lib/migrate'
+require 'migrate'
 
 class CreateAcls < ActiveRecord::Migration
   def self.up