merge doc.

README.md

@@ -31,11 +31,7 @@ Currently, besides authorized DNS server of DNSPod, there are various products i
 ## Quick Start
 
     # clone F-Stack
-<<<<<<< HEAD
     mkdir -p /data/f-stack
-=======
-    mkdir /data/f-stack
->>>>>>> aca62ecc5596c6283719465d643b88198182810f
     git clone https://github.com/F-Stack/f-stack.git /data/f-stack
 
     # install libnuma-dev

doc/F-Stack_API_Reference.md

@@ -23,11 +23,7 @@ Initialize F-Stack，including DPDK/FreeBSD network stack, etc.
 #### ff_run
 
 	void ff_run(loop_func_t loop, void *arg);
-<<<<<<< HEAD
 loop is a callback function，the service logic is implemented by the user, and called by each poll of F-Stack .
-=======
-loop is a callbask function，the service logic is implemented by the user, and called by each poll of F-Stack .
->>>>>>> aca62ecc5596c6283719465d643b88198182810f
 
 ### Control API
 

doc/F-Stack_Quick_Start_Guide.md

@@ -75,9 +75,5 @@ The mount point can be made permanent across reboots, by adding the following li
 	# run with start.sh
 	./start.sh -b ./redis-server -o /path/to/redis.conf
 	# or run like this:
-<<<<<<< HEAD
 	#./redis-server --conf config.ini --proc-type=primary --proc-id=0 /path/to/redis.conf
-=======
-	#./redis-server --conf=config.ini --proc-type=primary --proc-id=0 /path/to/redis.conf
->>>>>>> aca62ecc5596c6283719465d643b88198182810f