Sn1per by 1N3@CrowdShield

2018-03-09 11:28:47 -05:00
2 changed files with 1 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## CHANGELOG:
+* v4.2 - Fixed bad merge in 4.1 causing sniper to break.
 * v4.1 - Fixed a few bugs with various command line switches for airstrike and nuke modes.
 * v4.1 - Fixed issue with path relative file inclusion via the -f flag. You can now include just the local filename (sniper -f targets.txt).
 * v4.0 - Added new command switch options for all sniper scans (see --help for details)
--- a/3
+++ b/3
@@ -217,11 +217,8 @@ case $key in
    shift # past argument
    ;;
    -nl|--noloot)
-<<<<<<< HEAD
    LOOT="0"
-=======
    NOLOOT="1"
->>>>>>> b13866c8026af59a392a05f3b2254c4a1f049c81
    shift # past argument
    ;;
    -w|--workspace)