Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
"showStatusBar": true,
|
"showStatusBar": true,
|
||||||
"updateSubmodules": false,
|
"updateSubmodules": false,
|
||||||
"syncMethod": "merge",
|
"syncMethod": "merge",
|
||||||
"mergeStrategy": "none",
|
"mergeStrategy": "theirs",
|
||||||
"customMessageOnAutoBackup": false,
|
"customMessageOnAutoBackup": false,
|
||||||
"autoBackupAfterFileChange": true,
|
"autoBackupAfterFileChange": true,
|
||||||
"treeStructure": false,
|
"treeStructure": false,
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"ITS@@mini": false,
|
|
||||||
"ITS@@its-d": false,
|
|
||||||
"ITS@@accent-color": false,
|
|
||||||
"ITS@@notion": false,
|
|
||||||
"ITS@@canvas-cards": true,
|
|
||||||
"ITS@@select": "none",
|
|
||||||
"ITS@@nord": false,
|
|
||||||
"ITS@@drwn": true,
|
|
||||||
"ITS@@t-d": false,
|
|
||||||
"ITS@@s-d": false,
|
|
||||||
"ITS@@slrvb-g": false,
|
|
||||||
"ITS@@slrvb-b": false
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user