summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a024177..ee90379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -142,6 +142,10 @@ src/training/experiments/*
!src/training/experiments/line_ctc_experiment.yml
!src/training/experiments/default_config_emnist.yml
!src/training/experiments/embedding_experiment.yml
+<<<<<<< HEAD
src/text_recognizer/weights/*Transformer*.pt
+=======
+
+>>>>>>> 6cb08a110620ee09fe9d8a5d008197a801d025df
src/wandb/*
!src/wandb/settings