fixing merge conflicts

SecurityFTW · Jul 29, 2019 · 6f9614e · 6f9614e
2 parents 62567b5 + 7dbd863
commit 6f9614e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ optional arguments:
 ## Installation
 (in order to avoid missing with the already installed python libraries)
 
- - get project `git clone https://github.com/SecurityFTW/cs-suite.git &&
+ - get project `git clone --recursive https://github.com/SecurityFTW/cs-suite.git &&
 cd cs-suite/`   
  - install [virtualenv](https://virtualenv.pypa.io/en/latest/) `pip install virtualenv`
  - create a python 2.7 local enviroment `virtualenv -p python2.7 venv`  

diff --git a/setup.py b/setup.py