gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong merge in composer.json

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-04-19 16:39:04 +02:00
parent ce745efb3d
commit a0154623b5
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -26,7 +26,6 @@
}
},
"require": {
<<<<<<< HEAD
"php": ">=5.5.0",
"ext-mbstring": "*",
"ext-xml": "*",