chore: fix merge conflict

Author: XDRAGON2002

cve_bin_tool/cli.py

@@ -235,15 +235,12 @@ def main(argv=None):
         help="skips checking for a new version",
         default=False,
     )
-<<<<<<< HEAD
-=======
     parser.add_argument(
         "--offline",
         action="store_true",
         help="operate in offline mode",
         default=False,
     )
->>>>>>> 33b40fe... feat: improve locality of defaults
 
     merge_report_group = parser.add_argument_group(
         "Merge Report", "Arguments related to Intermediate and Merged Reports"