Resolve conflicts

This commit is contained in:
oobabooga 2023-09-21 17:45:11 -07:00
parent df39f455ad
commit 193fe18c8c
3 changed files with 0 additions and 44 deletions

3
.gitignore vendored
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
cache
characters
training/datasets
@ -34,6 +33,4 @@ models/config-user.yaml
.DS_Store
Thumbs.db
=======
installer_files/
>>>>>>> second-repo/main