Merge pull request #107 from ptcNOP/hotfix/nsrl_parse_merge_conflict

Resolve merge conflict

Author: awest1339

setup.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
-current_version = 1.0.0
-commit  = False
+current_version = 1.1.1
+commit = False
 tag = False
 
 [flake8]

setup.py

@@ -29,7 +29,7 @@ def recursive_dir_list(path, exclude=['.pyc', '__pycache__']):
 
 setup(
     name='multiscanner',
-    version='1.0.0',
+    version='1.1.1',
     url='https://github.com/MITRECND/multiscanner',
     license='MPL 2.0',
     author='Drew Bonasera',

utils/nsrl_parse.py

@@ -74,15 +74,9 @@ def parse_nsrl(input_file, output_dir):
                     offset.seek(offset_val * 12)
                     offset.write(struct.pack('Q', output.tell()))
                     last = offset_val
-<<<<<<< HEAD
-                output.write(line[0].lower()+'\t')
-                output.write(line[1].lower()+'\t')
-                output.write(line[3]+'\n')
-=======
                 output.write(line[0].lower() + '\t')
                 output.write(line[1].lower() + '\t')
                 output.write(line[3])
->>>>>>> 89a346c3b3ec8a65b850dc492deb1ab07b339454
                 count += 1