fe / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit 2383c31a191bdc46cdf85cab596e6978accc8ae6 1 parent 604601d6

解决冲突

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://
*
... ...