Skip to content

Commit eec01eb

Browse files
Merge branch '4.4' into 5.1
* 4.4: Remove "version" from composer.json files, use "branch-version" instead
1 parent 1a16bdf commit eec01eb

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

composer.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,13 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "5.1.x-dev"
32+
<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
33+
"extra": {
34+
"branch-version": "5.1-dev"
35+
}
36+
=======
37+
"extra": {
38+
"branch-version": "5.1-dev"
39+
}
40+
>>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
3341
}

0 commit comments

Comments
 (0)