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

diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb
index 2685447f46012a4fdb7e7ba9ccc4c8906e4725e8..dcf4c3f75310e054eadb4d096e93222d5397fc1f 100644 (file)
--- 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>