aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-31 17:36:23 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-31 17:36:23 -0800
commitd613d607372d4be29773993994afcd4315718e51 (patch)
treecd0faaf7f177d1dcad6026a06a2c809448a4e7d7
parentc4469e6c39f68eee97d6cc21412b685eaeb59dce (diff)
parentae3b015aa810d6cb57387eed6571e6b1f5799b98 (diff)
downloadrails-d613d607372d4be29773993994afcd4315718e51.tar.gz
rails-d613d607372d4be29773993994afcd4315718e51.tar.bz2
rails-d613d607372d4be29773993994afcd4315718e51.zip
Merge pull request #4799 from arunagw/warning_fixed_for_indentations
warning removed: mismatched indentations
-rw-r--r--activerecord/lib/active_record/associations/builder/association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 666926ff51..c3fa4a05fd 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -80,5 +80,5 @@ module ActiveRecord::Associations::Builder
end
end
end
- end
+ end
end