Fix comment typos

repo2docker/buildpacks/nix/__init__.py

@@ -64,7 +64,8 @@ class NixBuildPack(BaseImage):
     def get_start_script(self):
         """The path to a script to be executed as ENTRYPOINT"""
         # the shell wrapper script duplicates the behaviour of other buildpacks
-        # when it coems to the `start` script
+        # when it comes to the `start` script as well as handling a binder/
+        # sub-directory when it exists
         return "/usr/local/bin/nix-shell-wrapper"
 
     def detect(self):

tests/nix/binder-dir/README.rst

@@ -1,13 +1,4 @@
-<<<<<<< HEAD
 default.nix in a binder/ directory
 ----------------------------------
 
-Check we find and use `default.nix` when it is in a `binder/` sub-directory.
-=======
-Nix environment - default.nix
------------------------------
-
-You can install a nix shell environment using the traditional default.nix.
-
-Documentation on the syntax and typical setup of a ``nix-shell`` environment can be found `here <https://nixos.org/nix/manual/#sec-nix-shell>`_.
->>>>>>> 983b7f5... Add test and support for binder sub-directory
+Check we find and use ``default.nix`` when it is in a ``binder/`` sub-directory.