resolve conflicts

Shams-Z · Shams-Z · commit 6a1e4aec9463 · 2026-02-03T16:30:34.000-08:00
diff --git a/Workbooks/WorkbooksMetadata.json b/Workbooks/WorkbooksMetadata.json
@@ -9846,7 +9846,7 @@
 		"templateRelativePath": "VTI_IOC_Feed.json",
 		"subtitle": "",
 		"provider": "Visa"
- }
+  },
   {
     "workbookKey": "1PasswordWorkbook",
     "logoFileName": "1password.svg",

Original file line number	Diff line number	Diff line change
`@@ -9846,7 +9846,7 @@`
`9846`	`9846`	`"templateRelativePath": "VTI_IOC_Feed.json",`
`9847`	`9847`	`"subtitle": "",`
`9848`	`9848`	`"provider": "Visa"`
`9849`		`- }`
	`9849`	`+ },`
`9850`	`9850`	`{`
`9851`	`9851`	`"workbookKey": "1PasswordWorkbook",`
`9852`	`9852`	`"logoFileName": "1password.svg",`