From 21126839a86a9a0b328ea68ff96061d4077c65a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eren=20G=C3=B6lge?= <egolge@coqui.ai>
Date: Wed, 30 Jun 2021 14:09:49 +0200
Subject: [PATCH] Update .gitignore

---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3125f3f9..6f412def 100644
--- 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