aligned with main branch

jsporna · Feb 15, 2021 · 0cc6ecb · 0cc6ecb
1 parent 7292264
commit 0cc6ecb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pesel/main.py b/pesel/main.py
@@ -4,11 +4,7 @@
 
 
 def cli():
-<<<<<<< HEAD
     parser = argparse.ArgumentParser(prog="pesel", usage='%(prog)s')
-=======
-    parser = argparse.ArgumentParser(prog="pesel", usage='%(prog)s command [arguments]')
->>>>>>> main
 
     subparser = parser.add_subparsers(dest='command')
     generator = subparser.add_parser('generate', help='Generate PESEL number')