Merge branch 'master' of https://github.com/trustedsec/social-engineer-toolkit

Conflicts:
	src/html/Signed_Update.jar.orig
	src/html/unsigned/unsigned.jar

setoolkit

@@ -44,17 +44,6 @@ import shutil
 import re
 
 if check_kali() == "Kali":
-<<<<<<< HEAD
-    if check_config("BLEEDING_EDGE=").lower() != "on":
-        print_status("Kali bleeding edge was not detected to be on...")
-        print_status(
-            "Kali install detected. Note that if you are not using bleeding edge repositories, your version of SET will be roughly 4 months behind.")
-        print_status(
-            "It is recommended to switch to bleeding-edge repos to ensure you are running the latest version of SET and other tools.")
-        pause = raw_input(
-            "Press [enter] to accept that SET is several months out of date and probably contains bugs and issues.")
-
-=======
 	if check_config("BLEEDING_EDGE=").lower() != "on":
 		if not os.path.isdir(".git"):
 			print_status("Kali bleeding edge was not detected to be on...")	
@@ -62,7 +51,6 @@ if check_kali() == "Kali":
 			print_status("It is recommended to switch to bleeding-edge repos to ensure you are running the latest version of SET and other tools.")
 			pause = raw_input("Press [enter] to accept that SET is several months out of date and probably contains bugs and issues.")
 	
->>>>>>> e1891e7750024253b5c984aa58a226582ffcb2ab
 # check directory and make it
 if not os.path.isdir("src/logs/"):
     os.makedirs("src/logs/")