@@ -1435,24 +1435,6 @@ bloodhound-js@^1.2.3:
1435
1435
storage2 "^0.1.0"
1436
1436
superagent "^3.8.3"
1437
1437
1438
- <<<<<<< HEAD
1439
- bluebird@^3.5.5 :
1440
- version "3.7.2"
1441
- resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
1442
- integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
1443
-
1444
- bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9 :
1445
- version "4.12.0"
1446
- resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
1447
- integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
1448
-
1449
- bn.js@^5.0.0, bn.js@^5.1.1 :
1450
- version "5.1.3"
1451
- resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
1452
- integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
1453
-
1454
- =======
1455
- >>>>>>> Updated to Webpack Encore 1.0
1456
1438
body-parser@1.19.0 :
1457
1439
version "1.19.0"
1458
1440
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
@@ -1521,83 +1503,10 @@ braces@^3.0.1, braces@~3.0.2:
1521
1503
dependencies :
1522
1504
fill-range "^7.0.1"
1523
1505
1524
- <<<<<<< HEAD
1525
- brorand@^1.0.1, brorand@^1.1.0 :
1526
- version "1.1.0"
1527
- resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
1528
- integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
1529
-
1530
- browserify-aes@^1.0.0, browserify-aes@^1.0.4 :
1531
- version "1.2.0"
1532
- resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
1533
- integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
1534
- dependencies :
1535
- buffer-xor "^1.0.3"
1536
- cipher-base "^1.0.0"
1537
- create-hash "^1.1.0"
1538
- evp_bytestokey "^1.0.3"
1539
- inherits "^2.0.1"
1540
- safe-buffer "^5.0.1"
1541
-
1542
- browserify-cipher@^1.0.0 :
1543
- version "1.0.1"
1544
- resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
1545
- integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
1546
- dependencies :
1547
- browserify-aes "^1.0.4"
1548
- browserify-des "^1.0.0"
1549
- evp_bytestokey "^1.0.0"
1550
-
1551
- browserify-des@^1.0.0 :
1552
- version "1.0.2"
1553
- resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
1554
- integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
1555
- dependencies :
1556
- cipher-base "^1.0.1"
1557
- des.js "^1.0.0"
1558
- inherits "^2.0.1"
1559
- safe-buffer "^5.1.2"
1560
-
1561
- browserify-rsa@^4.0.0, browserify-rsa@^4.0.1 :
1562
- version "4.1.0"
1563
- resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
1564
- integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
1565
- dependencies :
1566
- bn.js "^5.0.0"
1567
- randombytes "^2.0.1"
1568
-
1569
- browserify-sign@^4.0.0 :
1570
- version "4.2.1"
1571
- resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
1572
- integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
1573
- dependencies :
1574
- bn.js "^5.1.1"
1575
- browserify-rsa "^4.0.1"
1576
- create-hash "^1.2.0"
1577
- create-hmac "^1.1.7"
1578
- elliptic "^6.5.3"
1579
- inherits "^2.0.4"
1580
- parse-asn1 "^5.1.5"
1581
- readable-stream "^3.6.0"
1582
- safe-buffer "^5.2.0"
1583
-
1584
- browserify-zlib@^0.2.0 :
1585
- version "0.2.0"
1586
- resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
1587
- integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
1588
- dependencies :
1589
- pako "~1.0.5"
1590
-
1591
- browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.14.6 :
1592
- version "4.14.7"
1593
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
1594
- integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
1595
- =======
1596
1506
browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.1 :
1597
1507
version "4.16.1"
1598
1508
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766"
1599
1509
integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==
1600
- >>>>>>> Updated to Webpack Encore 1.0
1601
1510
dependencies :
1602
1511
caniuse-lite "^1.0.30001173"
1603
1512
colorette "^1.2.1"
@@ -2406,30 +2315,10 @@ ee-first@1.1.1:
2406
2315
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
2407
2316
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
2408
2317
2409
- <<<<<<< HEAD
2410
- electron-to-chromium@^1.3.591 :
2411
- version "1.3.603"
2412
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
2413
- integrity sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==
2414
-
2415
- elliptic@^6.5.3 :
2416
- version "6.5.4"
2417
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
2418
- integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
2419
- dependencies :
2420
- bn.js "^4.11.9"
2421
- brorand "^1.1.0"
2422
- hash.js "^1.0.0"
2423
- hmac-drbg "^1.0.1"
2424
- inherits "^2.0.4"
2425
- minimalistic-assert "^1.0.1"
2426
- minimalistic-crypto-utils "^1.0.1"
2427
- =======
2428
2318
electron-to-chromium@^1.3.634 :
2429
2319
version "1.3.647"
2430
2320
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.647.tgz#8f1750ab7a5137f1a9a27f8f4ebdf550e08ae10b"
2431
2321
integrity sha512-Or2Nu8TjkmSywY9hk85K/Y6il28hchlonITz30fkC87qvSNupQl29O12BzDDDTnUFlo6kEIFL2QGSpkZDMxH8g==
2432
- >>>>>>> Updated to Webpack Encore 1.0
2433
2322
2434
2323
emoji-regex@^7.0.1 :
2435
2324
version "7.0.3"
@@ -3121,31 +3010,9 @@ hex-color-regex@^1.1.0:
3121
3010
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
3122
3011
3123
3012
highlight.js@^10.4.1 :
3124
- <<<<<<< HEAD
3125
- version "10.4.1"
3126
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
3127
- integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
3128
-
3129
- hmac-drbg@^1.0.1 :
3130
- version "1.0.1"
3131
- resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
3132
- integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
3133
- dependencies :
3134
- hash.js "^1.0.3"
3135
- minimalistic-assert "^1.0.0"
3136
- minimalistic-crypto-utils "^1.0.1"
3137
-
3138
- homedir-polyfill@^1.0.1 :
3139
- version "1.0.3"
3140
- resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
3141
- integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
3142
- dependencies :
3143
- parse-passwd "^1.0.0"
3144
- =======
3145
3013
version "10.5.0"
3146
3014
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.5.0.tgz#3f09fede6a865757378f2d9ebdcbc15ba268f98f"
3147
3015
integrity sha512-xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw==
3148
- >>>>>>> Updated to Webpack Encore 1.0
3149
3016
3150
3017
hosted-git-info@^2.1.4 :
3151
3018
version "2.8.8"
@@ -3822,9 +3689,9 @@ lodash.uniq@^4.5.0:
3822
3689
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
3823
3690
3824
3691
lodash@^4.0.0, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@~4.17.10 :
3825
- version "4.17.20 "
3826
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20 .tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52 "
3827
- integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA ==
3692
+ version "4.17.21 "
3693
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21 .tgz#679591c564c3bffaae8454cf0b3df370c3d6911c "
3694
+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg ==
3828
3695
3829
3696
loud-rejection@^1.0.0 :
3830
3697
version "1.6.0"
@@ -3983,14 +3850,6 @@ minimalistic-assert@^1.0.0:
3983
3850
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
3984
3851
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
3985
3852
3986
- <<<<<<< HEAD
3987
- minimalistic-crypto-utils@^1.0.1 :
3988
- version "1.0.1"
3989
- resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
3990
- integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
3991
-
3992
- =======
3993
- >>>>>>> Updated to Webpack Encore 1.0
3994
3853
minimatch@^3.0.4, minimatch@~3.0.2 :
3995
3854
version "3.0.4"
3996
3855
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
0 commit comments