Merge conflicts

Author: linusjf

spiderpromises3/.snyk

@@ -7,10 +7,10 @@ patch:
     - cheerio > lodash:
         patched: '2020-02-07T13:13:50.102Z'
     - snyk > @snyk/dep-graph > lodash:
-        patched: '2020-02-07T13:15:33.537Z'
+        patched: '2020-02-07T13:15:33.892Z'
     - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > lodash:
-        patched: '2020-02-07T13:15:33.537Z'
+        patched: '2020-02-07T13:15:33.892Z'
     - snyk > snyk-nuget-plugin > dotnet-deps-parser > lodash:
-        patched: '2020-02-07T13:15:33.537Z'
+        patched: '2020-02-07T13:15:33.892Z'
     - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > lodash:
-        patched: '2020-02-07T13:15:33.537Z'
+        patched: '2020-02-07T13:15:33.892Z'