Commit 93620432904fedc3f4052f4e472a7ab104686815
1 parent
91c6373693
Exists in
master
uncommited files
Showing 1 changed file with 5 additions and 21 deletions Side-by-side Diff
resources/views/workers/cabinet.blade.php
| ... | ... | @@ -265,35 +265,19 @@ $user = $worker->users |
| 265 | 265 | </div> |
| 266 | 266 | |
| 267 | 267 | |
| 268 | -<<<<<<< HEAD | |
| 269 | 268 | <div class="cabinet__inputs-item form-group"> |
| 270 | 269 | <label class="form-group__label">Контакты родственников:</label> |
| 271 | 270 | <div class="form-group__item"> |
| 272 | - {{ $worker->telephon2 ?? '-' }} | |
| 271 | + {{ $worker->telephone2 ?? '-' }} | |
| 273 | 272 | </div> |
| 274 | 273 | </div> |
| 275 | - | |
| 276 | - | |
| 277 | - | |
| 278 | - <div class="width100"> | |
| 279 | - <h4 class="cabinet__h4 mb-10">О себе</h4> | |
| 280 | - <div>{{ $worker->text }}</div> | |
| 281 | -======= | |
| 282 | - <div class="cabinet__inputs-item form-group"> | |
| 283 | - <label class="form-group__label">Контакты родственников:</label> | |
| 284 | - <div class="form-group__item"> | |
| 285 | - {{ $worker->telephone2 ?? '-' }} | |
| 286 | - </div> | |
| 287 | - </div> | |
| 288 | ->>>>>>> b67b944770e95eb4bd433dde26daedbcb4bc6ae9 | |
| 289 | - </div> | |
| 290 | 274 | </div> |
| 291 | 275 | </div> |
| 292 | 276 | |
| 293 | - <div class="width100"> | |
| 294 | - <h4 class="cabinet__h4 mb-10">О себе</h4> | |
| 295 | - <div>{{ $worker->text }}</div> | |
| 296 | - </div> | |
| 277 | + <div class="width100"> | |
| 278 | + <h4 class="cabinet__h4 mb-10">О себе</h4> | |
| 279 | + <div>{{ $worker->text }}</div> | |
| 280 | + </div> | |
| 297 | 281 | |
| 298 | 282 | <div class=""> |
| 299 | 283 | <a href="{{ route('worker.basic_information') }}" class="button active">Редактировать основную информацию</a> |