diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-05 23:50:01 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-05 23:50:01 +0000 |
| commit | e0b0f1315bb47be73990d5061dc9d5ce47150932 (patch) | |
| tree | c74003227f60f7615e84148041fc8ee2c0934c91 /app/views/issues | |
| parent | adbe4097b3f7eca7f2c2d0bf2139b4c6f3e89296 (diff) | |
| download | redmine-e0b0f1315bb47be73990d5061dc9d5ce47150932.tar.gz redmine-e0b0f1315bb47be73990d5061dc9d5ce47150932.zip | |
replace tabs to spaces at app/views/issues/_conflict.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8791 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_conflict.html.erb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb index 2685447f4..dcf4c3f75 100644 --- a/app/views/issues/_conflict.html.erb +++ b/app/views/issues/_conflict.html.erb @@ -1,19 +1,19 @@ <div class="conflict"> - <%= l(:notice_issue_update_conflict) %> + <%= l(:notice_issue_update_conflict) %> <% if @conflict_journals.present? %> - <div class="conflict-details"> + <div class="conflict-details"> <% @conflict_journals.sort_by(&:id).each do |journal| %> - <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p> - <% if journal.details.any? %> - <ul class="details"> - <% details_to_strings(journal.details).each do |string| %> - <li><%= string %></li> - <% end %> - </ul> - <% end %> - <%= textilizable(journal, :notes) unless journal.notes.blank? %> + <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p> + <% if journal.details.any? %> + <ul class="details"> + <% details_to_strings(journal.details).each do |string| %> + <li><%= string %></li> + <% end %> + </ul> + <% end %> + <%= textilizable(journal, :notes) unless journal.notes.blank? %> <% end %> - </div> + </div> <% end %> </div> <p> @@ -21,6 +21,6 @@ <% if @notes.present? %> <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br /> <% end %> - <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label> + <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label> </p> <p><%= submit_tag l(:button_submit) %></p> |