From 754321b4e232d67ffd9005ca252e4a5965d805f0 Mon Sep 17 00:00:00 2001
From: chrisr3d <chris.studer.68@gmail.com>
Date: Thu, 13 Sep 2018 10:37:46 +0200
Subject: [PATCH] Merging readme

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index b3b1919..a7f05c9 100644
--- a/README.md
+++ b/README.md
@@ -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.
 
 ## 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 :
->>>>>>> 79633242c842a6ca7c90a4c4e6bc002e05403aef
 
 Use pip wheel to create an archive
 ~~~