From 99885ce2e4899778d4054cdf5fbf2b244118f545 Mon Sep 17 00:00:00 2001
From: Yomi Colledge <baphled@boodah.net>
Date: Wed, 21 Apr 2010 12:09:46 +0100
Subject: [PATCH] Cleaned up copy issue and general up.

---
 app/views/features/merge.html.erb                | 4 ++--
 app/views/features/system_merge.html.erb         | 4 ++--
 features/plain/changes_view_improvements.feature | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/features/merge.html.erb b/app/views/features/merge.html.erb
index bd6062e0..4fe3c68f 100644
--- 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 %>
\ No newline at end of file
diff --git a/app/views/features/system_merge.html.erb b/app/views/features/system_merge.html.erb
index 434e2f8a..1d5ac8fd 100644
--- 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 %>
\ No newline at end of file
diff --git a/features/plain/changes_view_improvements.feature b/features/plain/changes_view_improvements.feature
index 130b8bde..4bbde523 100644
--- 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                                           |