Обновление данных

Андрей Ларионов
1 parent a82fb8ae68
Showing 3 changed files with 0 additions and 16 deletions Side-by-side Diff
app/Models/Ad_employer.php
resources/views/admin/education/form.blade.php
resources/views/modals/send_login.blade.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');
     }
@@ -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() ])}}",
@@ -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>
...	...	@@ -59,10 +59,7 @@ class Ad_employer extends Model
59	59	return $this->hasMany(Category::class, 'id');
60	60	}
61	61
62		-<<<<<<< HEAD
63		-=======
64	62
65		->>>>>>> e3c7b0ffb6cc8d6ffa38081411b3e113215722e6
66	63	public function scopeActive($query) {
67	64	return $query->where('is_remove', '=', '0');
68	65	}
...	...	@@ -208,19 +208,9 @@
208	208	@endisset
209	209	</div>
210	210
211		-<<<<<<< HEAD
212		-
213		-<!--<script src="{{ asset('/ckeditor/ckeditor.js') }}"></script>-->
214		-
215		-<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
216		-
217		-<!--<script src="{{ asset('./ckeditor/ckeditor.js') }}"></script>-->
218		-
219		-=======
220	211	<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
221	212
222	213	<!--<script src="{{ asset('./ckeditor/ckeditor.js') }}"></script>-->
223		->>>>>>> 8018b079503aa01fce021d8de2a8631691fbe310
224	214	<script>
225	215	CKEDITOR.replace( 'text', {
226	216	filebrowserUploadUrl: "{{route('ckeditor.image-upload', ['_token' => csrf_token() ])}}",
...	...	@@ -2,11 +2,8 @@
2	2	<div class="modal__body">
3	3	<div class="modal__title left">Войти</div>
4	4	<form class="modal__sign">
5		-<<<<<<< HEAD
6		-=======
7	5	<div id="message_error" name="message_error">
8	6	</div>
9		->>>>>>> e3c7b0ffb6cc8d6ffa38081411b3e113215722e6
10	7	<div class="modal__sign-item">
11	8	<input type="email" class="input" id="email" name="email" placeholder="E-mail" required>
12	9	</div>