From d982fddb186d554b9547fb4afa8e580767f01c20 Mon Sep 17 00:00:00 2001
From: hexcoder <hexcoder-@users.noreply.github.com>
Date: Mon, 10 May 2021 09:15:06 +0200
Subject: [PATCH] remove merge conflict artifacts

---
 frida_mode/README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frida_mode/README.md b/frida_mode/README.md
index 2c6b0316..d9634df2 100644
--- a/frida_mode/README.md
+++ b/frida_mode/README.md
@@ -53,13 +53,8 @@ instead we use 'O' in hommage to the [author](https://github.com/oleavr) of
 FRIDA.
 
 Similarly, the intention is to mimic the use of environment variables used by
-<<<<<<< Updated upstream
 QEMU where possible (by replacing `s/QEMU/FRIDA/g`). Accordingly, the
 following options are currently supported:
-=======
-QEMU where possible (although replacing `s/QEMU/FRIDA/g`). Accordingly, the
-following options are currently supported.
->>>>>>> Stashed changes
 
 * `AFL_FRIDA_DEBUG_MAPS` - See `AFL_QEMU_DEBUG_MAPS`
 * `AFL_FRIDA_EXCLUDE_RANGES` - See `AFL_QEMU_EXCLUDE_RANGES`