fix merge conflicts

thoughtspot · Oct 10, 2024 · 56e849a · 56e849a
1 parent 241db56
commit 56e849a
Show file tree

Hide file tree

Showing 11 changed files with 1,303 additions and 501 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ lib
 .DS_Store
 src/.DS_Store
 dist
+.vercel
diff --git a/generated_urls.json b/generated_urls.json
@@ -26,5 +26,9 @@
   {
     "name": "tester-chart",
     "sourceUrl": "http://localhost:3002/v1/tester-chart/"
+  },
+  {
+    "name": "custom-bar-chart",
+    "sourceUrl": "http://localhost:3002/v10_5/custom-bar-chart/"
   }
-]
+]
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "vite-plugin-react": "^3.0.2"
   },
   "dependencies": {
-    "@thoughtspot/ts-chart-sdk": "0.0.2-alpha.16",
+    "@thoughtspot/ts-chart-sdk": "0.0.2-alpha.17",
     "chart.js": "3.5.0",
     "chartjs-plugin-datalabels": "2.2.0",
     "eslint": "8.40.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ lib @@
     .DS_Store
     src/.DS_Store
     dist
+    .vercel