mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-11-04 15:11:31 +08:00 
			
		
		
		
	resolve code conflict in book.js
This commit is contained in:
		
							parent
							
								
									8f6087068e
								
							
						
					
					
						commit
						3d955abd31
					
				@ -868,7 +868,7 @@
 | 
			
		||||
        "no_attachments": "此笔记没有附件。"
 | 
			
		||||
    },
 | 
			
		||||
    "book": {
 | 
			
		||||
        "no_children_help": "此类型为书籍的笔记没有任何子笔记,因此没有内容显示。请参阅 <a href=\"https://github.com/zadam/trilium/wiki/Book-note\">wiki</a> 了解详情"
 | 
			
		||||
        "no_children_help": "此类型为书籍的笔记没有任何子笔记,因此没有内容显示。请参阅 <a href=\"https://github.com/TriliumNext/Docs/blob/main/Wiki/book-note.md\">wiki</a> 了解详情"
 | 
			
		||||
    },
 | 
			
		||||
    "editable_code": {
 | 
			
		||||
        "placeholder": "在这里输入您的代码笔记内容..."
 | 
			
		||||
 | 
			
		||||
@ -869,7 +869,7 @@
 | 
			
		||||
        "no_attachments": "This note has no attachments."
 | 
			
		||||
    },
 | 
			
		||||
    "book": {
 | 
			
		||||
        "no_children_help": "This note of type Book doesn't have any child notes so there's nothing to display. See <a href=\"https://github.com/zadam/trilium/wiki/Book-note\">wiki</a> for details."
 | 
			
		||||
        "no_children_help": "This note of type Book doesn't have any child notes so there's nothing to display. See <a href=\"https://github.com/TriliumNext/Docs/blob/main/Wiki/book-note.md\">wiki</a> for details."
 | 
			
		||||
    },
 | 
			
		||||
    "editable_code": {
 | 
			
		||||
        "placeholder": "Type the content of your code note here..."
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user