mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Fix bad merge
This commit is contained in:
@@ -949,13 +949,10 @@ async function getCharacters() {
|
||||
|
||||
await getGroups();
|
||||
await printCharacters();
|
||||
<<<<<<< HEAD
|
||||
await AA_CountCharTime(this_chid);
|
||||
|
||||
|
||||
=======
|
||||
updateCharacterCount('#rm_print_characters_block > div');
|
||||
>>>>>>> 040380e0fb8612b3017d7c6c119172ab2b34a107
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user