diff options
| author | hexcoder <hexcoder-@users.noreply.github.com> | 2021-05-10 09:15:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 09:15:06 +0200 |
| commit | d982fddb186d554b9547fb4afa8e580767f01c20 (patch) | |
| tree | 0d09b7795fbd03e6175cbf6a0758ccf93201900a | |
| parent | 7e0000021c8e456301bb861438752e0fe884660e (diff) | |
| download | afl++-d982fddb186d554b9547fb4afa8e580767f01c20.tar.gz | |
remove merge conflict artifacts
| -rw-r--r-- | frida_mode/README.md | 5 |
1 files changed, 0 insertions, 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` |