Fix merge conflicts

2024-08-18 13:03:09 -05:00
parent a1248fe62f 0e47ad9920
commit 898b126231
95 changed files with 3462 additions and 1934 deletions
@@ -298,6 +298,7 @@
  "create_new_collection": "Create a New Collection",
  "color": "Color",
  "reset": "Reset",
+  "updating_collection": "Updating Collection...",
  "collection_name_placeholder": "e.g. Example Collection",
  "collection_description_placeholder": "The purpose of this Collection...",
  "create_collection_button": "Create Collection",