Fix merge confict

grst · Sep 24, 2022 · a22932b · a22932b
1 parent 269bbfe
commit a22932b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -43,7 +43,6 @@ you can modify `Singularity.template`, and specify it with the `--template` argu
 
 
 ## How it works
-<<<<<<< HEAD
 
 Conda envs cannot simply be "moved" as some paths are hardcoded into the environment.
 I previously applied `conda-pack` to solve this issue, which works fine in most cases