Skip to content

Commit

Permalink
conflicts branch name removed.
Browse files Browse the repository at this point in the history
  • Loading branch information
vrkansagara authored Feb 5, 2021
1 parent 3529742 commit e90fd71
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
"prefer-stable": true,
"extra": {
"laravel": {
"branch-alias": {
"master-dev": "develop"
},
"providers": [
"Vrkansagara\\LaraOutPress\\ServiceProvider"
],
Expand Down

0 comments on commit e90fd71

Please sign in to comment.