Merge branch 'master' of https://github.com/obissick/maxinero #45
obissickAnnotations
2 errors
|
laravel-tests
"./composer.lock" does not contain valid JSON
Parse error on line 146:
...octrine/inflector",<<<<<<< HEAD
---------------------^
Expected: 'STRING' - It appears you have an extra trailing comma
|
|
laravel-tests
Process completed with exit code 1.
|