b12f 702b201d1e feat: actually working conflict resolution		2024-08-17 12:31:53 +02:00
.envrc	Remove unnecessary env call	2023-01-25 21:51:28 +01:00
.gitignore	Initial commit	2023-01-25 21:49:22 +01:00
fix-conflicts.ts	feat: actually working conflict resolution	2024-08-17 12:31:53 +02:00
flake.lock	Initial commit	2023-01-25 21:49:22 +01:00
flake.nix	Initial commit	2023-01-25 21:49:22 +01:00