diff options
| author | Ernie Miller <ernie@metautonomo.us> | 2010-05-26 20:49:39 -0400 |
|---|---|---|
| committer | Ernie Miller <ernie@metautonomo.us> | 2010-05-26 20:49:39 -0400 |
| commit | c69dfd53dec5dbc9d73469e373db6bb51db1c8dd (patch) | |
| tree | 832aa0281b0eaa932eda77f6e6da0be194db97ae /spec/relations | |
| parent | 43bfd3fae496a2a859aad0a654a91437357c3450 (diff) | |
| parent | 2ee391231842eec5ce75517c0b24576c1e2a3261 (diff) | |
| download | rails-c69dfd53dec5dbc9d73469e373db6bb51db1c8dd.tar.gz rails-c69dfd53dec5dbc9d73469e373db6bb51db1c8dd.tar.bz2 rails-c69dfd53dec5dbc9d73469e373db6bb51db1c8dd.zip | |
Merge branch 'brynary'
Diffstat (limited to 'spec/relations')
| -rw-r--r-- | spec/relations/join_spec.rb | 2 | ||||
| -rw-r--r-- | spec/relations/relation_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/relations/join_spec.rb b/spec/relations/join_spec.rb index b5ead51053..b4a46fae97 100644 --- a/spec/relations/join_spec.rb +++ b/spec/relations/join_spec.rb @@ -39,4 +39,4 @@ describe "Arel" do it_should_behave_like 'A Relation' end -end
\ No newline at end of file +end diff --git a/spec/relations/relation_spec.rb b/spec/relations/relation_spec.rb index b5b73e2205..cfc1c1410b 100644 --- a/spec/relations/relation_spec.rb +++ b/spec/relations/relation_spec.rb @@ -28,4 +28,4 @@ describe "Arel" do end end end -end
\ No newline at end of file +end |