Merging readme

pull/233/head
chrisr3d 2018-09-13 10:37:46 +02:00
parent c91795dbcc
commit 754321b4e2
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
1 changed files with 0 additions and 4 deletions

View File

@ -384,11 +384,7 @@ Recommended Plugin.Import_ocr_enabled true Enable or disable the ocr
In this same menu set any other plugin settings that are required for testing. In this same menu set any other plugin settings that are required for testing.
## Install misp-module on an offline instance. ## Install misp-module on an offline instance.
<<<<<<< HEAD
First, you need to grab all necessery packages for example like this :
=======
First, you need to grab all necessary packages for example like this : First, you need to grab all necessary packages for example like this :
>>>>>>> 79633242c842a6ca7c90a4c4e6bc002e05403aef
Use pip wheel to create an archive Use pip wheel to create an archive
~~~ ~~~