Resolve "NKJP parameter tuning"

Closes #6 (closed)

core/utils/data_utils.py

@@ -311,7 +311,6 @@ def convert_examples_to_features_nosq(examples, label_list, max_seq_length, enco
         assert len(valid) == max_seq_length
         assert len(label_mask) == max_seq_length
 
-<<<<<<< HEAD
         if ex_index < 2:
             logging.debug("*** Example ***")
             logging.debug("guid: %s" % example.guid)
@@ -328,14 +327,6 @@ def convert_examples_to_features_nosq(examples, label_list, max_seq_length, enco
                                       label_mask=label_mask))
 
 
-=======
-        features.append(
-            InputFeatures(input_ids=token_ids,
-                          input_mask=input_mask,
-                          label_id=label_ids,
-                          valid_ids=valid,
-                          label_mask=label_mask))
->>>>>>> 4f7642433a515aa3d14550ddb1b0009ffe824c16
     return features
 
 
@@ -529,10 +520,3 @@ def map_json_to_iob(json_ann, iob):
                     out_iob += line
     failed_to_add = len(token_dict) - successfully_added
     return out_iob, successfully_added, failed_to_add, derives
-<<<<<<< HEAD
-<<<<<<< HEAD:core/utils/data_utils.py
-
-=======
->>>>>>> 9-models:core/utils/data_utils.py
-=======
->>>>>>> 4f7642433a515aa3d14550ddb1b0009ffe824c16