commit eaeabfcea3886365d54d38dfcf36a1049712df6a
author pineafan <ash@pinea.dev> Sat Jun 24 18:31:25 2023 +0100
committer pineafan <ash@pinea.dev> Sat Jun 24 18:31:25 2023 +0100
tree 8d5053cca7cdd9f14c1a70e2d84d4c117949bf49
parent 33a307e061d2cda4d3fe963a6404701cd5f432da
parent ad22890085f44a26b851009bc9e7222dd03e43c8

Merge fun times

.gitignore

diff --git a/.gitignore b/.gitignore
index 07c1488..9e8d50b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -147,3 +147,6 @@
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+
+# nix
+result/

pnpm-lock.yaml

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e20aa3a..83d1669 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,8 +1,4 @@
-lockfileVersion: "6.1"
-
-settings:
-    autoInstallPeers: true
-    excludeLinksFromLockfile: false
+lockfileVersion: "6.0"
 
 overrides:
     "@hokify/agenda>mongodb": ^5.6.0