cloudstore-developers

Merge conflicts on readme files

4/17/2015 6:34:45 AM

Simon Ivanšek

Commit: 36c72d0

Tree: a0f6ba8

Parents: 0e8e16d
ae6322c

Changes

.gitignore 2(+1 -1)

README.md 2(+1 -1)

Details

.gitignore 2(+1 -1)

diff --git a/.gitignore b/.gitignore
index 0d8548b..4d9bfd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ dist/cloudscale-deployment-scripts-0.1.0
 build
 dist
 deployment_scripts.log
-results/
+bin/results/

README.md 2(+1 -1)

diff --git a/README.md b/README.md
index b11662e..f8f52bb 100644
--- a/README.md
+++ b/README.md
@@ -47,4 +47,4 @@ To deploy MongoDB version of showcase on OpenStack edit ```bin/config.openstack.
 
 ```
 $ python run.py openstack config.openstack.mongo.ini
-```
\ No newline at end of file
+```