From f38a86cb07468c6ba25e2484b1c6582ad884a20e Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Tue, 31 Mar 2015 18:00:49 +0800
Subject: [PATCH] v1.0-beta.4 fix conflict

---
 conf/app.conf | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 3fe75ad..41ded9d 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -10,15 +10,9 @@ site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
 db.host=localhost
 db.port=27017
 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.password= # if not exists, please leave it blank
 # or you can set the mongdb url for more complex needs the format is:
->>>>>>> dev
 # mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
 # db.url=mongodb://root:root123@localhost:27017/leanote