mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 04:51:31 +08:00 
			
		
		
		
	Merge branch 'stable' into next60
This commit is contained in:
		
						commit
						bb45c67e60
					
				| @ -2,7 +2,7 @@ | |||||||
|   "name": "trilium", |   "name": "trilium", | ||||||
|   "productName": "Trilium Notes", |   "productName": "Trilium Notes", | ||||||
|   "description": "Trilium Notes", |   "description": "Trilium Notes", | ||||||
|   "version": "0.59.1", |   "version": "0.59.2", | ||||||
|   "license": "AGPL-3.0-only", |   "license": "AGPL-3.0-only", | ||||||
|   "main": "electron.js", |   "main": "electron.js", | ||||||
|   "bin": { |   "bin": { | ||||||
|  | |||||||
| @ -1 +1 @@ | |||||||
| module.exports = { buildDate:"2023-02-28T23:39:34+01:00", buildRevision: "9eb3075f65af98bd8c4a8ca8cc241ae2ae05bfa9" }; | module.exports = { buildDate:"2023-03-14T21:15:08+01:00", buildRevision: "d8e9086bdeb721db795783b5d92395a9bd6882c9" }; | ||||||
|  | |||||||
| @ -157,7 +157,7 @@ class ConsistencyChecks { | |||||||
|                     let message = `Branch '${branchId}' was was missing parent note '${parentNoteId}', so it was deleted. `; |                     let message = `Branch '${branchId}' was was missing parent note '${parentNoteId}', so it was deleted. `; | ||||||
| 
 | 
 | ||||||
|                     if (becca.getNote(noteId).getParentBranches().length === 0) { |                     if (becca.getNote(noteId).getParentBranches().length === 0) { | ||||||
|                         const newBranch = new Branch({ |                         const newBranch = new BBranch({ | ||||||
|                             parentNoteId: 'root', |                             parentNoteId: 'root', | ||||||
|                             noteId: noteId, |                             noteId: noteId, | ||||||
|                             prefix: 'recovered' |                             prefix: 'recovered' | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam