Merge pull request #107 from ptcNOP/hotfix/nsrl_parse_merge_conflict

Resolve merge conflict
mitre · Mar 15, 2018 · 7fb07b5 · 7fb07b5
2 parents 4a2c756 + 57c04da
commit 7fb07b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
-current_version = 1.0.0
-commit  = False
+current_version = 1.1.1
+commit = False
 tag = False
 
 [flake8]

diff --git a/setup.py b/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',

diff --git a/utils/nsrl_parse.py b/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