resolved conflicts

This commit is contained in:
2025-03-31 03:46:05 +03:00
6454 changed files with 1520539 additions and 9 deletions
@@ -0,0 +1,11 @@
{
"name": "Cancer",
"alias": "cancer",
"description": "",
"keywords": [],
"priority": 0,
"providers": [
"Modules\\Cancer\\Providers\\CancerServiceProvider"
],
"files": []
}