Resolved merge conflict in MarineController.cs

2025-04-09 16:49:18 +08:00 · 2025-04-09 16:49:18 +08:00 · 9225a489e5
commit 9225a489e5
parent 5b0553527b 76cbe99b98
1 changed files with 4 additions and 0 deletions
--- a/Areas/MMS/Controllers/MarineController.cs
+++ b/Areas/MMS/Controllers/MarineController.cs
@ -54,6 +54,10 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers
                return StatusCode(StatusCodes.Status500InternalServerError, "An error occurred while viewing the PDF. " + ex.Message);
            }
        }
+<<<<<<< HEAD

+=======
+        
+>>>>>>> refs/remotes/origin/misya
    }
 }