ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-10 01:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove merge conflict artifacts

Browse Source
This commit is contained in:
hexcoder 2021-05-10 09:15:06 +02:00 committed by GitHub
parent 7e0000021c
commit d982fddb18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frida_mode/README.md
View File

@ -53,13 +53,8 @@ instead we use 'O' in hommage to the [author](https://github.com/oleavr) of
FRIDA. FRIDA.
Similarly, the intention is to mimic the use of environment variables used by 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 QEMU where possible (by replacing `s/QEMU/FRIDA/g`). Accordingly, the
following options are currently supported: 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_DEBUG_MAPS` - See `AFL_QEMU_DEBUG_MAPS`
* `AFL_FRIDA_EXCLUDE_RANGES` - See `AFL_QEMU_EXCLUDE_RANGES` * `AFL_FRIDA_EXCLUDE_RANGES` - See `AFL_QEMU_EXCLUDE_RANGES`