Update .gitignore

2026-09-10 11:50:20 +08:00 · 2021-06-30 14:09:49 +02:00
parent 3584a04552
commit 21126839a8
1 changed files with 1 additions and 4 deletions
@@ -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