From a28014305f033c48169dc76c42a0787c17e559de Mon Sep 17 00:00:00 2001
From: Zakarya <zakarya.boudouar@stud.hs-emden-leer.de>
Date: Wed, 6 Nov 2019 13:16:04 +0100
Subject: [PATCH] Merge branch 'dev' of
 /home/zakarya/CLionProjects/vkvm/shared-memory with conflicts.

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index ad5a2dd..961aac1 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,3 @@ Use the installation script provided in the Scripts repository
 to install the full package.
 
 Installing a single component is currently not supported.
-