merge 충돌 처리

adm/shop_admin/orderlist.php

@@ -327,14 +327,13 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
         <option value="">선택하세요</option>
         <option value="주문">주문</option>
         <option value="입금">입금</option>
+        <option value="준비">준비</option>
         <option value="배송">배송</option>
         <option value="완료">완료</option>
     </select>
     <input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
 </div>
 
-</form>
-
 <div class="local_desc01 local_desc">
 <p>
     &lt;무통장&gt;인 경우에만 &lt;주문&gt;에서 &lt;입금&gt;으로 변경됩니다. 가상계좌는 입금시 자동으로 &lt;입금&gt;처리됩니다.<br>
@@ -342,6 +341,8 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
 </p>
 </div>
 
+</form>
+
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
 
 <script>
@@ -400,6 +401,8 @@ function forderlist_submit(f)
         }
     }
 
+    f.action = "./orderlistupdate.php";
+
     return true;
 }
 </script>