From 04ab791c1e9d23fce48a8637bdcdcbf561581de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= <alarionov@nologostudio.ru>
Date: Mon, 4 Mar 2024 10:45:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0?=
 =?UTF-8?q?=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Ad_employer.php                     |    3 ---
 resources/views/admin/education/form.blade.php |   10 ----------
 resources/views/modals/send_login.blade.php    |    3 ---
 3 files changed, 16 deletions(-)

diff --git a/app/Models/Ad_employer.php b/app/Models/Ad_employer.php
index 3d70d68..da6da3e 100644
--- a/app/Models/Ad_employer.php
+++ b/app/Models/Ad_employer.php
@@ -59,10 +59,7 @@ class Ad_employer extends Model
         return $this->hasMany(Category::class, 'id');
     }
 
-<<<<<<< HEAD
-=======
 
->>>>>>> e3c7b0ffb6cc8d6ffa38081411b3e113215722e6
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
diff --git a/resources/views/admin/education/form.blade.php b/resources/views/admin/education/form.blade.php
index 4030afe..dea1fb2 100644
--- a/resources/views/admin/education/form.blade.php
+++ b/resources/views/admin/education/form.blade.php
@@ -208,19 +208,9 @@
     @endisset
 </div>
 
-<<<<<<< HEAD
-
-<!--<script src="{{ asset('/ckeditor/ckeditor.js') }}"></script>-->
-
-<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
-
-<!--<script src="{{ asset('./ckeditor/ckeditor.js') }}"></script>-->
-
-=======
 <script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
 
 <!--<script src="{{ asset('./ckeditor/ckeditor.js') }}"></script>-->
->>>>>>> 8018b079503aa01fce021d8de2a8631691fbe310
 <script>
     CKEDITOR.replace( 'text', {
         filebrowserUploadUrl: "{{route('ckeditor.image-upload', ['_token' => csrf_token() ])}}",
diff --git a/resources/views/modals/send_login.blade.php b/resources/views/modals/send_login.blade.php
index dac65f8..80e3691 100644
--- a/resources/views/modals/send_login.blade.php
+++ b/resources/views/modals/send_login.blade.php
@@ -2,11 +2,8 @@
     <div class="modal__body">
         <div class="modal__title left">Войти</div>
         <form class="modal__sign">
-<<<<<<< HEAD
-=======
             <div id="message_error" name="message_error">
             </div>
->>>>>>> e3c7b0ffb6cc8d6ffa38081411b3e113215722e6
             <div class="modal__sign-item">
                 <input type="email" class="input" id="email" name="email" placeholder="E-mail" required>
             </div>
-- 
1.7.10.4