Resolve conflicts
This commit is contained in:
parent
df39f455ad
commit
193fe18c8c
3 changed files with 0 additions and 44 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue