fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 0dac8b49196f3747ac86e4e47a0509a076e47bec 1 parent 32c76b3b

code review by hf: do merge liangzhifeng codes

Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
... ... @@ -130,10 +130,7 @@ class Helpers
public static function getShoppingKeyByCookie()
{
$cookie = isset($_COOKIE['_Spk']) ? $_COOKIE['_Spk'] : '';
<<<<<<< HEAD
=======
>>>>>>> develop
return $cookie;
}
... ...