remove merge leftovers

pull/129/merge
jwollert 12 years ago
parent be78673459
commit 7d0193500c
  1. 8
      spec/lib/journal_formatter/diff_spec.rb

@ -8,20 +8,12 @@ describe OpenProject::JournalFormatter::Diff do
include ActionView::Helpers::UrlHelper
include Rails.application.routes.url_helpers
<<<<<<< HEAD
Struct.new("TestJournal", :id)
=======
Struct.new("TestJournal", :id, :journaled)
>>>>>>> feature/rails3_fix_issue_description_diff
let(:klass) { OpenProject::JournalFormatter::Diff }
let(:id) { 1 }
let(:journal) do
<<<<<<< HEAD
Struct::TestJournal.new(id)
=======
Struct::TestJournal.new(id, Issue.new)
>>>>>>> feature/rails3_fix_issue_description_diff
end
let(:instance) { klass.new(journal) }
let(:key) { "description" }

Loading…
Cancel
Save