1

app/Controller/WebsiteController.php

@@ -1160,12 +1160,8 @@ class WebsiteController extends AbstractController
      * @return array
      */
 
-<<<<<<< HEAD
-    public function  addWebsiteTemplateintel(){
-=======
     public function addWebsiteTemplateintel()
     {
->>>>>>> 20241216_fr_diyweb
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,