xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
life
2015-03-31 16:56:26 +08:00
parent 5fae5dd10e
commit f959694b0f
18 changed files with 34 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf/routes
View File

@ -39,10 +39,6 @@ POST /findPasswordUpdate Auth.FindPasswordUpdate
* /note/searchNoteByTags Note.SearchNoteByTags
* /note/toImage Note.ToImage
* /note/html2Image Note.Html2Image
<<<<<<< HEAD:conf/routes
=======
* /note/exportPdf Note.ExportPDF
>>>>>>> dev-life:conf/routes
* /note/setNote2Blog Note.SetNote2Blog
# pjax
GET /note/:noteId Note.Index