From 93620432904fedc3f4052f4e472a7ab104686815 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: Wed, 10 Jul 2024 10:14:48 +0300
Subject: [PATCH] uncommited files

---
 resources/views/workers/cabinet.blade.php |   26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/resources/views/workers/cabinet.blade.php b/resources/views/workers/cabinet.blade.php
index c8889c6..e7c5e75 100644
--- a/resources/views/workers/cabinet.blade.php
+++ b/resources/views/workers/cabinet.blade.php
@@ -265,35 +265,19 @@ $user = $worker->users
                                 </div>
 
 
-<<<<<<< HEAD
                                 <div class="cabinet__inputs-item form-group">
                                     <label class="form-group__label">Контакты родственников:</label>
                                     <div class="form-group__item">
-                                        {{ $worker->telephon2 ?? '-' }}
+                                        {{ $worker->telephone2 ?? '-' }}
                                     </div>
                                 </div>
-
-
-
-                                <div class="width100">
-                                    <h4 class="cabinet__h4 mb-10">О себе</h4>
-                                    <div>{{ $worker->text }}</div>
-=======
-                                    <div class="cabinet__inputs-item form-group">
-                                        <label class="form-group__label">Контакты родственников:</label>
-                                        <div class="form-group__item">
-                                            {{ $worker->telephone2 ?? '-' }}
-                                        </div>
-                                    </div>
->>>>>>> b67b944770e95eb4bd433dde26daedbcb4bc6ae9
-                                </div>
                             </div>
                         </div>
 
-                            <div class="width100">
-                                <h4 class="cabinet__h4 mb-10">О себе</h4>
-                                <div>{{ $worker->text }}</div>
-                            </div>
+                        <div class="width100">
+                            <h4 class="cabinet__h4 mb-10">О себе</h4>
+                            <div>{{ $worker->text }}</div>
+                        </div>
 
                         <div class="">
                             <a href="{{ route('worker.basic_information') }}" class="button active">Редактировать  основную информацию</a>
-- 
1.7.10.4