From 27d88fe9983edcefc8a0c96fdcf4dec17ca68f7b Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 17 May 2018 09:56:22 +0800
Subject: [PATCH]  * merge code.

---
 module/project/view/create.html.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index e79f4cb845..bacd6eb60c 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -138,14 +138,10 @@
           <td colspan='3'><?php echo html::checkbox('whitelist', $groups, $whitelist, '', '', 'inline');?></td>
         </tr>
         <tr>
-<<<<<<< HEAD
-          <td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td>
-=======
-          <td colspan='4' class='text-center'>
+          <td colspan='4' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
->>>>>>> d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e
         </tr>
       </table>
     </form>