* Merge changes from stash

2015-02-17 22:08:02 -05:00 · 2015-02-17 22:08:02 -05:00 · 8715101239
parent 23c1f6fc04
commit 8715101239
1 changed files with 5 additions and 0 deletions
--- a/bin/parser/train.py
+++ b/bin/parser/train.py
@ -61,8 +61,13 @@ def read_docparse_gold(file_):
        tags = []
        ids = []
        lines = sent_str.strip().split('\n')
+<<<<<<< HEAD
        raw_text = lines.pop(0).strip()
        tok_text = lines.pop(0).strip()
+=======
+        raw_text = lines.pop(0)
+        tok_text = lines.pop(0)
+>>>>>>> master
        for i, line in enumerate(lines):
            id_, word, pos_string, head_idx, label = _parse_line(line)
            if label == 'root':