From a8f9a390a5a1c607c27031ac126f2723770f74c9 Mon Sep 17 00:00:00 2001
From: baghizadizn <baghizadizn@unesa.ac.id>
Date: Mon, 17 Nov 2025 15:37:12 +0700
Subject: [PATCH] fix bug

---
 .../views/admin/instructor/show_document.blade.php    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/resources/views/admin/instructor/show_document.blade.php b/resources/views/admin/instructor/show_document.blade.php
index 8252ca6..e7bada0 100644
--- a/resources/views/admin/instructor/show_document.blade.php
+++ b/resources/views/admin/instructor/show_document.blade.php
@@ -37,17 +37,6 @@
         height="80">
 </div>
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <p>$placeholder_image: {{ $placeholder_image ?? 'N/A' }}</p>
-
-    <p>$user_photo: {{ $user_photo ?? 'N/A' }}</p>
-
-=======
->>>>>>> c5be8e9ecd4a9d17e50f6ad75e170b1bdeae0cec
-=======
->>>>>>> c5be8e9ecd4a9d17e50f6ad75e170b1bdeae0cec
-
 <ul class="instructor-info">
     <li>
         <span>{{ get_phrase('Applicant') }}</span>