fixing conflicts and merging dev
This commit is contained in:
commit
c64da1de46
3 files changed
+66
-9
No files matched your search
@@ -9,3 +9,6 @@ node_modules/
|
||||
|
||||
# Sync
|
||||
*.sync-conflict*
|
||||
|
||||
# VSCode
|
||||
.vscode/
|
||||
Reference in new issue
Block a user