merge conflict

metagenome-atlas · May 21, 2021 · 30449da · 30449da
1 parent 366d669
commit 30449da
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/atlas/envs/eggNOG.yaml b/atlas/envs/eggNOG.yaml
@@ -3,10 +3,6 @@ channels:
     - bioconda
     - defaults
 dependencies:
-<<<<<<< HEAD
     - eggnog-mapper >=2.1.2
-=======
-    - eggnog-mapper <=2, <2.1.2
->>>>>>> 44ce9ca17d2d4e49fbe130258dab0dd5c4ddc06e
     - diamond = 2.0.6
     - wget # to download_eggnog_data on macOS