Cleaned up copy issue and general up.

baphled · Apr 21, 2010 · 99885ce · 99885ce
1 parent 0808d57
commit 99885ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/views/features/merge.html.erb b/app/views/features/merge.html.erb
@@ -4,11 +4,11 @@
 
 <%= render :partial => "legend", :locals => {:diff_from => "file", :diff_to => "file"}  %>
 
-<div class="notice">This will change the source file. Unless you use source control, you may lose all changes</div>
-
 <span id="panel" class="ui-widget ui-widget-content ui-corner-all">
   <%= link_to 'Dry-run', file_merge_feature_path(@feature, :dry_run => true) %>
   <%= link_to 'Patch', file_merge_feature_path(@feature) %>
 </span>
 
+<div class="notice">This will change the source file. Unless you use source control, you may lose all changes</div>
+
 <%= @pretty.to_html %>
diff --git a/app/views/features/system_merge.html.erb b/app/views/features/system_merge.html.erb
@@ -4,10 +4,10 @@
 
 <%= render :partial => "legend", :locals => {:diff_from => "system", :diff_to => "system"}  %>
 
-<div class="notice">This will change will update the system feature</div>
-
 <span id="panel" class="ui-widget ui-widget-content ui-corner-all">
   <%= link_to 'Update', system_sync_feature_path(@feature) %>
 </span>
 
+<div class="notice">This change will update the system feature</div>
+
 <%= @pretty.to_html %>
diff --git a/features/plain/changes_view_improvements.feature b/features/plain/changes_view_improvements.feature
@@ -30,5 +30,5 @@ Feature: Changes view improvements
 
     Examples: Changes notices
       | link          | notice                                                                                    |
-      | merge changes | This will change the source file. Unless you use source control, you may lose all changes |
-      | merge system  | This will change will update the system feature                                           |
+      | merge changes | This change the source file. Unless you use source control, you may lose all changes |
+      | merge system  | This change will update the system feature                                           |