修改错误

@@ -11,11 +11,8 @@ use WebPlugin\Cache;
 use WebPlugin\Images;
 use Configs\WebCacheConfig;
 use Hood\Core\Security\AuthCode;
-<<<<<<< HEAD
 use WebPlugin\UdpLog;
-=======
 use Configs\ChannelConfig;
->>>>>>> remotes/origin/release/4.4
 
 /**
  * 购物车相关的模板数据模型