Skip to content

Commit 6a9f0cc

Browse files
phernandezclaude
andcommitted
Merge latest from main and resolve config conflicts
Resolved merge conflict in config.py by keeping both new fields: - disable_permalinks from PR #313 - skip_initialization_sync from main - api_url from PR #313 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: phernandez <paul@basicmachines.co>
2 parents 01ef9e4 + 33ee1e0 commit 6a9f0cc

79 files changed

Lines changed: 8482 additions & 2979 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,10 @@ canvas(nodes, edges, title, folder) - Generate knowledge visualizations
371371

372372
See the [Documentation](https://memory.basicmachines.co/) for more info, including:
373373

374-
- [Complete User Guide](https://memory.basicmachines.co/docs/user-guide)
375-
- [CLI tools](https://memory.basicmachines.co/docs/cli-reference)
376-
- [Managing multiple Projects](https://memory.basicmachines.co/docs/cli-reference#project)
377-
- [Importing data from OpenAI/Claude Projects](https://memory.basicmachines.co/docs/cli-reference#import)
374+
- [Complete User Guide](https://docs.basicmemory.com/user-guide/)
375+
- [CLI tools](https://docs.basicmemory.com/guides/cli-reference/)
376+
- [Managing multiple Projects](https://docs.basicmemory.com/guides/cli-reference/#project)
377+
- [Importing data from OpenAI/Claude Projects](https://docs.basicmemory.com/guides/cli-reference/#import)
378378

379379
## License
380380

0 commit comments

Comments
 (0)