Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / db / migrate / 017_populate_node_tags_and_remove.rb

diff --git a/db/migrate/013_populate_node_tags_and_remove.rb b/db/migrate/017_populate_node_tags_and_remove.rb
similarity index 100%
rename from db/migrate/013_populate_node_tags_and_remove.rb
rename to db/migrate/017_populate_node_tags_and_remove.rb