Skip to content

Commit 70a5403

Browse files
committed
Attempt to fix conflict
1 parent 06702ea commit 70a5403

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"files": ["autoload_aliases.php"],
2222
"exclude-from-classmap": [ "Tests/","vendor/propel/propel1/runtime/lib","vendor/propel/propel1/generator/lib" ]
2323
},
24-
"version": "4.0",
24+
"version": "4.4",
2525
"require": {
2626
"ext-simplexml": "*",
2727
"ext-pdo": "*",
@@ -38,7 +38,6 @@
3838
"symfony/propel1-bridge": ">=2.8.0"
3939
},
4040
"replace": {
41-
"symfony/propel1-bridge": "<=2.8.0",
4241
"propel/propel-bundle": "1.6.x-dev"
4342
},
4443
"suggest": {

0 commit comments

Comments
 (0)