1 files changed, 9 insertions, 1 deletions

diff --git a/shell.nix b/shell.nix
index ed306ec4d..9e50886c5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -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)