合并冲突

1459c791 · liuyuzhen · e57c64d8 · b18abc07 · 1459c791 · 1459c791
Commit 1459c791 authored Jan 16, 2019 by liuyuzhen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

a.php a.php +1 -1

test.php public/test.php +1 -1

No files found.
--- a/a.php
+++ b/a.php
 <?php
-echo 1;exit;
+phpinfo();exit;
 header("Content-type: text/html; charset=utf-8");
 //利用PHP目录和文件函数遍历用户给出目录的所有的文件和文件夹，修改文件名称
 function fRename($dirname)

--- a/public/test.php
+++ b/public/test.php
 <?php
-echo 1;exit;
+phpinfo();exit;
 echo json_encode($_SERVER);exit;
 $res=file_exists('/www/web/testadmin_shenbd_com/public_html/data/upload/mall/avatar/member_avatar_26.jpg');
 var_dump($res);