brargain limit pollconfig 更改

src/Common/Pool/Config/BargainPoolConfig.php

@@ -21,21 +21,14 @@ use Swoft\Bean\Annotation\Value;
 class BargainPoolConfig extends PoolProperties
 {
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 67d11e9d1c40be5b86a0d76e64c27c95b7f7be07
     public function __construct()
     {
         // 区别本地和线上的RPC服务地址
         $this->uri = explode(',', env('RPC_BARGAIN_URI', 'bargain:8099'));
-<<<<<<< HEAD
-    }
-
-=======
 
     }
->>>>>>> 67d11e9d1c40be5b86a0d76e64c27c95b7f7be07
+
     protected $name = 'bargain';
 
     /**