mirror of
https://gitlab.com/omair-personal/exchange.git
synced 2026-08-19 04:24:08 +00:00
fix conflict
This commit is contained in:
Jack Goh
Generated
+59
-93
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"_readme": [
|
||||
"This file locks the dependencies of your project to a known state",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "61c96f9a80f168154bc8f5383f0a85c1",
|
||||
@@ -933,29 +933,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
<<<<<<< HEAD
|
||||
"version": "v5.6.26",
|
||||
"version": "v5.6.29",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "7047df295e77cecb6a2f84736a732af66cc6789c"
|
||||
"reference": "acc6b5c54ab196d3358f60acc5f55d9ebaaccc02"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/7047df295e77cecb6a2f84736a732af66cc6789c",
|
||||
"reference": "7047df295e77cecb6a2f84736a732af66cc6789c",
|
||||
=======
|
||||
"version": "v5.6.28",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f",
|
||||
"reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f",
|
||||
>>>>>>> 12fd1676189e5e62e226b96068bfba6afa4af8e5
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/acc6b5c54ab196d3358f60acc5f55d9ebaaccc02",
|
||||
"reference": "acc6b5c54ab196d3358f60acc5f55d9ebaaccc02",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1081,11 +1068,7 @@
|
||||
"framework",
|
||||
"laravel"
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2018-06-20T14:21:11+00:00"
|
||||
=======
|
||||
"time": "2018-07-17T14:15:36+00:00"
|
||||
>>>>>>> 12fd1676189e5e62e226b96068bfba6afa4af8e5
|
||||
"time": "2018-07-26T16:01:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/socialite",
|
||||
@@ -1282,16 +1265,16 @@
|
||||
},
|
||||
{
|
||||
"name": "lcobucci/jwt",
|
||||
"version": "3.2.2",
|
||||
"version": "3.2.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/lcobucci/jwt.git",
|
||||
"reference": "0b5930be73582369e10c4d4bb7a12bac927a203c"
|
||||
"reference": "01da822b3c2982ca9f2a1234f802a3ec001527ec"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/0b5930be73582369e10c4d4bb7a12bac927a203c",
|
||||
"reference": "0b5930be73582369e10c4d4bb7a12bac927a203c",
|
||||
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/01da822b3c2982ca9f2a1234f802a3ec001527ec",
|
||||
"reference": "01da822b3c2982ca9f2a1234f802a3ec001527ec",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1336,7 +1319,7 @@
|
||||
"JWS",
|
||||
"jwt"
|
||||
],
|
||||
"time": "2017-09-01T08:23:26+00:00"
|
||||
"time": "2018-07-29T14:38:43+00:00"
|
||||
},
|
||||
{
|
||||
"name": "league/flysystem",
|
||||
@@ -2184,16 +2167,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f"
|
||||
"reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f",
|
||||
"reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
|
||||
"reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2248,11 +2231,11 @@
|
||||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-31T10:17:53+00:00"
|
||||
"time": "2018-07-16T14:05:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/css-selector.git",
|
||||
@@ -2305,16 +2288,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/debug.git",
|
||||
"reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
|
||||
"reference": "a1f2118cedb8731c45e945cdd2b808ca82abc4b5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
|
||||
"reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/a1f2118cedb8731c45e945cdd2b808ca82abc4b5",
|
||||
"reference": "a1f2118cedb8731c45e945cdd2b808ca82abc4b5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2357,20 +2340,20 @@
|
||||
],
|
||||
"description": "Symfony Debug Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-06-08T09:39:36+00:00"
|
||||
"time": "2018-07-06T14:52:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
"reference": "2391ed210a239868e7256eb6921b1bd83f3087b5"
|
||||
"reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5",
|
||||
"reference": "2391ed210a239868e7256eb6921b1bd83f3087b5",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
|
||||
"reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2420,11 +2403,11 @@
|
||||
],
|
||||
"description": "Symfony EventDispatcher Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-04-06T07:35:57+00:00"
|
||||
"time": "2018-07-10T11:02:47+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
@@ -2473,16 +2456,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-foundation.git",
|
||||
"reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3"
|
||||
"reference": "8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
|
||||
"reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0",
|
||||
"reference": "8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2523,20 +2506,20 @@
|
||||
],
|
||||
"description": "Symfony HttpFoundation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-06-19T21:38:16+00:00"
|
||||
"time": "2018-07-16T14:05:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-kernel.git",
|
||||
"reference": "29c094a1c4f8209b7e033f612cbbd69029e38955"
|
||||
"reference": "ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/29c094a1c4f8209b7e033f612cbbd69029e38955",
|
||||
"reference": "29c094a1c4f8209b7e033f612cbbd69029e38955",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3",
|
||||
"reference": "ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2610,7 +2593,7 @@
|
||||
],
|
||||
"description": "Symfony HttpKernel Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-06-25T13:06:45+00:00"
|
||||
"time": "2018-07-23T17:16:22+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
@@ -2891,7 +2874,7 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
@@ -2940,16 +2923,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/routing.git",
|
||||
"reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932"
|
||||
"reference": "73770bf3682b4407b017c2bdcb2b11cdcbce5322"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/b38b9797327b26ea2e4146a40e6e2dc9820a6932",
|
||||
"reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/73770bf3682b4407b017c2bdcb2b11cdcbce5322",
|
||||
"reference": "73770bf3682b4407b017c2bdcb2b11cdcbce5322",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3013,20 +2996,20 @@
|
||||
"uri",
|
||||
"url"
|
||||
],
|
||||
"time": "2018-06-19T21:38:16+00:00"
|
||||
"time": "2018-06-28T06:30:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
|
||||
"reference": "2dd74d6b2dcbd46a93971e6ce7d245cf3123e957"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
|
||||
"reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/2dd74d6b2dcbd46a93971e6ce7d245cf3123e957",
|
||||
"reference": "2dd74d6b2dcbd46a93971e6ce7d245cf3123e957",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3082,20 +3065,20 @@
|
||||
],
|
||||
"description": "Symfony Translation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-06-22T08:59:39+00:00"
|
||||
"time": "2018-07-23T08:20:20+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/var-dumper",
|
||||
"version": "v4.1.1",
|
||||
"version": "v4.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/var-dumper.git",
|
||||
"reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b"
|
||||
"reference": "9f882aed43f364de1d43038e8fb39703c577afc1"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
|
||||
"reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/9f882aed43f364de1d43038e8fb39703c577afc1",
|
||||
"reference": "9f882aed43f364de1d43038e8fb39703c577afc1",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3157,7 +3140,7 @@
|
||||
"debug",
|
||||
"dump"
|
||||
],
|
||||
"time": "2018-06-23T12:23:56+00:00"
|
||||
"time": "2018-07-05T11:54:23+00:00"
|
||||
},
|
||||
{
|
||||
"name": "tijsverkoyen/css-to-inline-styles",
|
||||
@@ -3283,16 +3266,16 @@
|
||||
},
|
||||
{
|
||||
"name": "vlucas/phpdotenv",
|
||||
"version": "v2.5.0",
|
||||
"version": "v2.5.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/vlucas/phpdotenv.git",
|
||||
"reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a"
|
||||
"reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
|
||||
"reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
|
||||
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
|
||||
"reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3329,7 +3312,7 @@
|
||||
"env",
|
||||
"environment"
|
||||
],
|
||||
"time": "2018-07-01T10:25:50+00:00"
|
||||
"time": "2018-07-29T20:33:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "zizaco/entrust",
|
||||
@@ -4490,18 +4473,6 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
<<<<<<< HEAD
|
||||
"version": "7.2.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "400a3836ee549ae6f665323ac3f21e27eac7155f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/400a3836ee549ae6f665323ac3f21e27eac7155f",
|
||||
"reference": "400a3836ee549ae6f665323ac3f21e27eac7155f",
|
||||
=======
|
||||
"version": "7.2.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
@@ -4512,7 +4483,6 @@
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e878aff7917ef66e702e03d1359b16eee254e2c",
|
||||
"reference": "8e878aff7917ef66e702e03d1359b16eee254e2c",
|
||||
>>>>>>> 12fd1676189e5e62e226b96068bfba6afa4af8e5
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4583,11 +4553,7 @@
|
||||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2018-06-21T13:13:39+00:00"
|
||||
=======
|
||||
"time": "2018-07-15T05:20:50+00:00"
|
||||
>>>>>>> 12fd1676189e5e62e226b96068bfba6afa4af8e5
|
||||
},
|
||||
{
|
||||
"name": "sebastian/code-unit-reverse-lookup",
|
||||
|
||||
Reference in New Issue
Block a user