Update .gitignore

coqui-ai · Jun 30, 2021 · 2112683 · 2112683
1 parent 3584a04
commit 2112683
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -140,11 +140,8 @@ events.out*
 old_configs/*
 model_importers/*
 model_profiling/*
-<<<<<<< HEAD
 docs/source/TODO/*
-=======
-docs/*
->>>>>>> univnet
+docs/source/models/*
 .noseids
 .dccache
 log.txt