Skip to content

Commit

Permalink
Merge branch 'obsidianmd:master' into aksh-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
aksh1618 authored Jan 29, 2024
2 parents c32855a + 4888b0b commit 5e0fa2d
Show file tree
Hide file tree
Showing 5 changed files with 3,688 additions and 2 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

# npm
node_modules
package-lock.json
pnpm-lock.yaml

# Don't include the compiled main.js file in the repo.
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-importer",
"name": "Importer",
"version": "1.5.5",
"version": "1.5.6",
"minAppVersion": "0.15.0",
"description": "Import notes from various apps and formats to Obsidian.",
"author": "Obsidian",
Expand Down
Loading

0 comments on commit 5e0fa2d

Please sign in to comment.