Merge branch 'master' into upgradeTS

# Conflicts: # packages/eslint-plugin-obsidian/package.json # packages/react-obsidian/package.json # yarn.lock
wix-incubator · Sep 15, 2024 · 9234edd · 9234edd
2 parents e209bea + 1b83860
commit 9234edd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/eslint-plugin-obsidian/package.json b/packages/eslint-plugin-obsidian/package.json
@@ -74,4 +74,4 @@
     "injector"
   ],
   "license": "ISC"
-}
+}
diff --git a/packages/react-obsidian/package.json b/packages/react-obsidian/package.json
@@ -96,4 +96,4 @@
     "url": "https://github.com/wix-incubator/react-obsidian/issues"
   },
   "homepage": "https://github.com/wix-incubator/react-obsidian#readme"
-}
+}