Skip to content

Commit

Permalink
Merge branch 'master' into v4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lluisp committed Apr 18, 2018
2 parents 0418dd9 + 0fdfec1 commit 727de79
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libfreeling/language.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1546,11 +1546,11 @@ namespace freeling {
ptree = new_ptree;
}
// if the last word is before the one in p2, we try the new pointers
else if (w_end_pos < ps2->get_position())
else if (w_end_pos < ps2->get_position()) {
ps_res = new_ps_res;
ptree = new_ptree;
set_iterators(ps1, ps2, parse, ps_res, ptree);

}
// if the last word is after ps2, ptree and ps_res are the input ones.
}
}
Expand Down

0 comments on commit 727de79

Please sign in to comment.