why do i even need to do this

LICENSE

@@ -1,6 +1,5 @@
 This is free and unencumbered software released into the public domain.
 
-<<<<<<< HEAD
 Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
 
 In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and
@@ -9,27 +8,3 @@ successors. We intend this dedication to be an overt act of relinquishment in pe
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 For more information, please refer to <http://unlicense.org/>
-=======
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <https://unlicense.org>
->>>>>>> 9bab5dc (Initial commit)

README.md

@@ -2,3 +2,8 @@
 Password crack checker
 
 Just a simple password crack time checker, will think things like password123 is strong so don't use it for anything important.
+
+To run:
+Have python setup, download the code, run the main.py with python.
+I may add a website version later so you don't need to download it, if it exists, the link will be under here.
+It's not here.

generator.py

@@ -1,31 +0,0 @@
-import random
-import string
-import questionary
-
-def generate_password(length,use_upper=True,use_lower=True,use_digits=True,use_symbols=True):
-    characters=""
-    if use_upper:characters+=string.ascii_uppercase
-    if use_lower:characters+=string.ascii_lowercase
-    if use_digits:characters+=string.ascii_uppercase
-    if use_symbols:characters+=string.punctuation
-    characterslist=list(characters)
-    password=""
-    if not characters:
-        return ""
-    for i in range(length):
-        password+=random.choice(characterslist)
-    return password
-def main():
-    print("Bitwarden password generator clone")
-    length=questionary.text("How long?",validate=lambda text: True if text.isdigit() else "Please enter a valid number").ask()
-    use_upper=questionary.confirm("Use uppercase?").ask()
-    use_lower=questionary.confirm("Use lowercase?").ask()
-    use_digits=questionary.confirm("Use digits?").ask()
-    use_symbols=questionary.confirm("Use symbols?").ask()
-    pw=generate_password(int(length),use_upper,use_lower,use_digits,use_symbols)
-    if pw:
-        print(pw)
-    else:
-        print("You didn't choose anything to put in, here's your password anyway: \"\"")
-if __name__=="__main__":
-    main()

main.py

@@ -1,6 +1,4 @@
 import string
-import time
-time.strftime("%s %d")
 
 def get_charecter_pool_size(password):
     pool_size=0