catalyx/PSTW_CentralizeSystem
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved merge conflict in MarineController.cs

Browse Source
This commit is contained in:
misya 2025-04-09 16:49:18 +08:00
commit 9225a489e5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Areas/MMS/Controllers/MarineController.cs
View File

@ -54,6 +54,10 @@ namespace PSTW_CentralSystem.Areas.MMS.Controllers
return StatusCode(StatusCodes.Status500InternalServerError, "An error occurred while viewing the PDF. " + ex.Message); return StatusCode(StatusCodes.Status500InternalServerError, "An error occurred while viewing the PDF. " + ex.Message);
} }
} }
<<<<<<< HEAD
=======
>>>>>>> refs/remotes/origin/misya
} }
} }