consolidated files

Conflicts:

	lib/arel/algebra/predicates.rb
	lib/arel/algebra/relations/writes/delete.rb
	lib/arel/algebra/relations/writes/insert.rb
	lib/arel/algebra/relations/writes/update.rb
	lib/arel/engines/memory/predicates.rb
	lib/arel/engines/memory/relations.rb
	lib/arel/engines/sql/primitives/attribute.rb
	lib/arel/engines/sql/relations/writes/insert.rb
	lib/arel/engines/sql/relations/writes/update.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/arel/unit/relations/table_spec.rb b/spec/arel/unit/relations/table_spec.rb
index 211e6921f8..2779c0fe5d 100644
--- a/spec/arel/unit/relations/table_spec.rb
+++ b/spec/arel/unit/relations/table_spec.rb
@@ -73,14 +73,14 @@ module Arel
       describe '#reset' do
         it "reloads columns from the database" do
           lambda { stub(@relation.engine).columns { [] } }.should_not change { @relation.attributes }
-          lambda { @relation.reset }.should change { @relation.attributes }
+          lambda { @relation.reset                       }.should     change { @relation.attributes }
         end
       end
     end
 
     describe 'hashing' do
       it "implements hash equality" do
-        Table.new(:users).should hash_the_same_as(Table.new(:users))
+        Table.new(:users).should     hash_the_same_as(Table.new(:users))
         Table.new(:users).should_not hash_the_same_as(Table.new(:photos))
       end
     end