fix merge conflict README

This commit is contained in:
WahyuTegarP 2026-04-02 19:22:49 +07:00
commit 6ad396bc27
1 changed files with 4 additions and 0 deletions

View File

@ -1,3 +1,4 @@
HEAD
<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p> <p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
<p align="center"> <p align="center">
@ -57,3 +58,6 @@ ## Security Vulnerabilities
## License ## License
The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
=======
# PawMedic
>>>>>>> 2bb7f6b9301b796972b3cc1427e9336f3820159e