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

v1.0-beta.4 fix conflict

Browse Source
This commit is contained in:
life
2015-03-31 18:00:49 +08:00
parent f755574576
commit f38a86cb07
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
conf/app.conf
View File

@ -10,15 +10,9 @@ site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
db.host=localhost db.host=localhost
db.port=27017 db.port=27017
db.dbname=leanote # required db.dbname=leanote # required
<<<<<<< HEAD
db.username=root # if not exists, please leave it blank
db.password=abc123 # if not exists, please leave it blank
# or you can set the mongdb url
=======
db.username= # if not exists, please leave it blank db.username= # if not exists, please leave it blank
db.password= # 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: # or you can set the mongdb url for more complex needs the format is:
>>>>>>> dev
# mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb # mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
# db.url=mongodb://root:root123@localhost:27017/leanote # db.url=mongodb://root:root123@localhost:27017/leanote