fe / YOHOBUYPC · Commits

Go to a project

Authored by 郭成尧
Commit 4ccaeb69489351f250093efb9535c25a53156b6f 1 parent 5e09f68b

'conflict'

Inline Side-by-side
Showing 1 changed file with 0 additions and 4 deletions
... ... @@ -1090,11 +1090,7 @@ class Helpers
{
return preg_match("/[\x7f-\xff]/", $str);
}
<<<<<<< HEAD
=======
>>>>>>> master
/**
* 将首字符为//的url转换为http://
*
... ...