Update PySploit.py

Author: ahmadnourallah

PySploit.py

@@ -79,11 +79,8 @@ def uninstall():
 def main():
     parser = ArgumentParser(prog='PySploit',usage='python3 PySploit.py [options]',  add_help=False)
     help_arguments = parser.add_argument_group('help arguments')
-<<<<<<< HEAD
     help_arguments.add_argument('-v', '--version', action='version', version="version 1.2")
-=======
     help_arguments.add_argument('-v', '--version', action='version', version="version 1.1")
->>>>>>> bec4e46061970e58833d21ccdfe8793e5457c876
     help_arguments.add_argument('-h', '--help', action='help', default=SUPPRESS, help='show this help message and exit.')
     optional_arguments = parser.add_argument_group('optional arguments')
     optional_arguments.add_argument('-c', '--create', dest='filename', required=False, help='create module sample')