Bladeren bron

chore: fix merge conflicts

Estevao Soares dos Santos 6 jaren geleden
bovenliggende
commit
fc7ac1e1ca
2 gewijzigde bestanden met toevoegingen van 282 en 247 verwijderingen
  1. 280 245
      package-lock.json
  2. 2 2
      package.json

File diff suppressed because it is too large
+ 280 - 245
package-lock.json


+ 2 - 2
package.json

@@ -56,10 +56,10 @@
     "semver": "5.4.x",
     "semver-sort": "0.0.x",
     "sinon": "^5.1.1",
-    "source-map-support": "^0.5.6"
+    "source-map-support": "^0.5.9"
   },
   "dependencies": {
     "jsdom": "^11.0.0",
-    "yargs": "^12.0.0"
+    "yargs": "^12.0.2"
   }
 }

Some files were not shown because too many files changed in this diff