diff options
| author | Percy Wegmann <percy@tailscale.com> | 2023-12-21 15:57:01 -0600 |
|---|---|---|
| committer | Percy Wegmann <percy@tailscale.com> | 2024-02-02 12:33:48 -0600 |
| commit | 857cef70c97fe019ea24f7b4f24252f4746ebcc3 (patch) | |
| tree | 257a7ec87af6ad29c06cdfe0e8774259f5e83cc3 /shell.nix | |
| parent | 60657ac83f415555c19027b0b18c0fe2d15bf40a (diff) | |
| download | tailscale-flyingsquirrel_bak.tar.xz tailscale-flyingsquirrel_bak.zip | |
tailfs: initial implementationflyingsquirrel_bak
Implemented WebDAV-based core of Tailfs
Updates tailscale/corp#16827
Signed-off-by: Percy Wegmann <percy@tailscale.com>
Diffstat (limited to 'shell.nix')
| -rw-r--r-- | shell.nix | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -16,4 +16,12 @@ ) { src = ./.; }).shellNix -# nix-direnv cache busting line: sha256-b/iffKOn7nMiWvM0AIGGzZaJ15NTaBlJff+aja3NQio= +<<<<<<< HEAD +# nix-direnv cache busting line: sha256-3NzfNgqSjDILsm2kzP9S0lc+Xmej0gAdDqGJOsWrKdk= +======= +<<<<<<< HEAD +# nix-direnv cache busting line: sha256-3NzfNgqSjDILsm2kzP9S0lc+Xmej0gAdDqGJOsWrKdk= +======= +# nix-direnv cache busting line: sha256-3NzfNgqSjDILsm2kzP9S0lc+Xmej0gAdDqGJOsWrKdk= +>>>>>>> 3bc261cc (tailfs: initial implementation) +>>>>>>> db634a9b (tailfs: initial implementation) |