解决冲突

app/JsonRpc/PublicRpcService.php

@@ -286,7 +286,6 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-<<<<<<< HEAD
     public function getWebsiteTemplateInfo(array $data){
         return $this->__request(__FUNCTION__, $data);
     }
@@ -306,9 +305,6 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @return array|mixed
      */
     public function uploadFile(array $data)
-=======
-    public function getWebsiteTemplateInfo(array $data)
->>>>>>> 20250208_onelogin_fr
     {
         return $this->__request(__FUNCTION__, $data);
     }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -147,7 +147,6 @@ interface PublicRpcServiceInterface
     public function updateComponent(array $data);
     public function getWebsiteTemplateList(array $data);
     public function getWebsiteTemplateInfo(array $data);
-<<<<<<< HEAD
     /**
      * @param array $data
      * @return mixed
@@ -160,6 +159,4 @@ interface PublicRpcServiceInterface
      */
     public function uploadFile(array $data);
 
-=======
->>>>>>> 20250208_onelogin_fr
 }