From 3325cb882f228cb0a3ec3c5f2bb8094457e887a2 Mon Sep 17 00:00:00 2001
From: Patrick Copeland <pcopeland@mitre.org>
Date: Thu, 15 Mar 2018 12:27:02 -0400
Subject: [PATCH 1/2] Resolve merge conflict

---
 utils/nsrl_parse.py | 6 ------
 1 file changed, 6 deletions(-)

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

From 57c04da96169c535d1abf4f9e580f75fc5dc34dd Mon Sep 17 00:00:00 2001
From: Patrick Copeland <pcopeland@mitre.org>
Date: Thu, 15 Mar 2018 12:46:25 -0400
Subject: [PATCH 2/2] Bump version: 1.1.0 -> 1.1.1

---
 setup.cfg | 4 ++--
 setup.py  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 6cb584e6..2ac03eb8 100644
--- 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
index ce17692b..a3d74645 100755
--- 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',