Skip to content

Commit 91d19ab

Browse files
Merge pull request #120 from TheDragonCode/4.x
Fixed conflict block
2 parents e4fcae4 + 3d7a899 commit 91d19ab

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
},
6565
"conflict": {
6666
"andrey-helldar/laravel-actions": "*",
67-
"dragon-code/laravel-actions": "*"
67+
"dragon-code/laravel-migration-actions": "*"
6868
},
6969
"minimum-stability": "stable",
7070
"prefer-stable": true,

0 commit comments

Comments
 (0)