Skip to content

Commit e606bcd

Browse files
committed
Attempt to fix conflict
1 parent e22fe0b commit e606bcd

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"symfony/propel1-bridge": ">=2.8.0"
4040
},
4141
"replace": {
42-
"symfony/propel1-bridge": "<=2.8.0",
4342
"propel/propel-bundle": "1.6.x-dev"
4443
},
4544
"suggest": {

0 commit comments

Comments
 (0)