fix server

fix gitignore
2025-11-17 08:30:37 +00:00 · 2025-11-17 08:26:22 +00:00 · 2025-11-17 08:12:57 +00:00
4 changed files with 11 additions and 0 deletions
--- a/public/phpmyadmin
+++ b/public/phpmyadmin
@ -0,0 +1 @@
+/usr/share/phpmyadmin
--- a/resources/views/admin/instructor/show_document.blade.php
+++ b/resources/views/admin/instructor/show_document.blade.php
@ -37,6 +37,16 @@
        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
Author	SHA1	Message	Date
baghizadizn	9ab93fc01c	fix server	2025-11-17 08:30:37 +00:00
baghizadizn	ea41a82a04	fix server	2025-11-17 08:26:22 +00:00
baghizadizn	cc4862a8da	fix gitignore	2025-11-17 08:12:57 +00:00