Skip to content

Commit a46f954

Browse files
committed
fix composer-merge-plugin version
1 parent 3ebfa0f commit a46f954

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

core/composer.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"league/flysystem": "^1.0.8",
6060
"phpmailer/phpmailer": "6.*",
6161
"tracy/tracy": "~2.5",
62-
"wikimedia/composer-merge-plugin": "dev-feature/composer-v2 as 1.5.0",
62+
"wikimedia/composer-merge-plugin": "2.*",
6363
"symfony/process": "^5.1",
6464
"i-rocky/eloquent-dynamic-relation": "^1.0",
6565
"dmitry-suffi/redis-session-handler": "*",
@@ -134,11 +134,5 @@
134134
"source": "https://github.com/evolution-cms/evolution/",
135135
"docs": "http://docs.evo.im",
136136
"telegram": "https://t.me/evolutioncms"
137-
},
138-
"repositories": [
139-
{
140-
"type": "vcs",
141-
"url": "https://github.com/mcaskill/composer-merge-plugin"
142-
}
143-
]
137+
}
144138
}

0 commit comments

Comments
 (0)