Skip to content

Commit 166f9e6

Browse files
Merge branch '4.4' into 5.1
* 4.4: [appveyor] fix checking for the .x branch Remove "branch-alias", populate "version"
1 parent 1969965 commit 166f9e6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"extra": {
33-
"branch-alias": {
34-
"dev-master": "5.1-dev"
35-
}
36-
}
32+
<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
33+
"version": "5.1-dev"
34+
=======
35+
"version": "4.4-dev"
36+
>>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
3737
}

0 commit comments

Comments
 (0)