fixing merge

This commit is contained in:
maxwell 2010-09-15 13:29:39 -07:00
commit c57f6b2d9a

View file

@ -37,6 +37,7 @@ describe Salmon do
it 'should parse out the authors diaspora_handle' do
@parsed_salmon.author_email.should == @user.person.diaspora_handle
end
it 'should reference a local author' do