firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc4s

Browse Source 
Conflicts:
	shop/orderform.php
This commit is contained in:
gnuboard
2013-06-28 09:24:39 +09:00
parent ca742d0668 7c3b787920
commit 3c34ac40c7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shop/orderform.php
View File

@ -941,7 +941,10 @@ function get_intall_file()
브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다. 브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.
</p> </p>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
======= =======
>>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f >>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
<div id="display_pay_button" class="btn_confirm" style="display:none"> <div id="display_pay_button" class="btn_confirm" style="display:none">
@ -1615,4 +1618,8 @@ include_once('./_tail.php');
<script> <script>
CheckPayplusInstall(); CheckPayplusInstall();
<<<<<<< HEAD
</script> </script>
=======
</script>
>>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f