4 changed files with 0 additions and 11 deletions
--- a/public/phpmyadmin
+++ b/public/phpmyadmin
@ -1 +0,0 @@
-/usr/share/phpmyadmin
--- a/resources/views/admin/instructor/show_document.blade.php
+++ b/resources/views/admin/instructor/show_document.blade.php
@ -37,16 +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>
--- a/storage/.DS_Store
+++ b/storage/.DS_Store
--- a/storage/framework/.DS_Store
+++ b/storage/framework/.DS_Store