handled merge conflict

boscore · Apr 10, 2019 · f9cc441 · f9cc441
2 parents 8b9e8b9 + a533105
commit f9cc441
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Docker/README.md b/Docker/README.md
@@ -198,4 +198,5 @@ The `blocks` data are stored under `--data-dir` by default, and the wallet files
 
 ### About MongoDB Plugin
 
-Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.
+Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.
+
diff --git a/README.md b/README.md
@@ -45,3 +45,4 @@ BOSCore bases on EOSIO, so you can also referer:
 
 [EOSIO Developer Portal](https://developers.eos.io).
 
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -198,4 +198,5 @@ The `blocks` data are stored under `--data-dir` by default, and the wallet files

		### About MongoDB Plugin

		Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.
		Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,3 +45,4 @@ BOSCore bases on EOSIO, so you can also referer:

		[EOSIO Developer Portal](https://developers.eos.io).