From 2bf467fb60c0a0b5b7399d6b4f61d131311d8aaf Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Fri, 1 Nov 2019 20:52:59 +0800
Subject: [PATCH] Update merge.html.erb

---
 app/views/admin/journal_papers/merge.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index e2533bf..7bf9cd9 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -25,8 +25,8 @@ function change_mode(){
     <% else %>
         <input type="checkbox" onchange='change_mode()'><span>否</span>
     <% end %>
+    <button type="button" onclick="merge_form.submit()"><%= t('personal_journal.merge') %></button>
 </form>
-<button type="button" onclick="merge_form.submit()"><%= t('personal_journal.merge') %></button>
 </nobr>
 <form method="get" action='?' name='merge_form'>
 <table class="table main-list">