Commit 6a9f0cc
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>79 files changed
Lines changed: 8482 additions & 2979 deletions
File tree
- docs
- specs
- src/basic_memory
- api
- routers
- cli
- commands
- cloud
- mcp
- tools
- repository
- schemas
- services
- sync
- test-int
- cli
- mcp
- tests
- api
- cli
- mcp
- tools
- schemas
- services
- sync
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
371 | 371 | | |
372 | 372 | | |
373 | 373 | | |
374 | | - | |
375 | | - | |
376 | | - | |
377 | | - | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
378 | 378 | | |
379 | 379 | | |
380 | 380 | | |
| |||
0 commit comments