fix conflict

conf/app.conf

@@ -4,27 +4,16 @@
 
 http.port=9000
 
-<<<<<<< HEAD:conf/app.conf
-site.url=http://localhost:9000
-=======
 site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
->>>>>>> dev-life:conf/app.conf
 
 # mongdb
 db.host=localhost
 #db.host=leanote
 db.port=27017
-<<<<<<< HEAD:conf/app.conf
-db.dbname=leanote_beta2 # required
-db.username= # if not exists, please leave it blank
-db.password= # if not exists, please leave it blank
-# or you can set the mongdb url
-=======
 db.dbname=leanote # required
 db.username= # if not exists, please leave it blank
 db.password= # if not exists, please leave it blank
 # or you can set the mongdb url for more complex needs the format is:
->>>>>>> dev-life:conf/app.conf
 # mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
 # db.url=mongodb://root:root123@localhost:27017/leanote
 

conf/routes

@@ -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