You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/09/11 21:31:20 UTC
[49/50] [abbrv] lucenenet git commit: Fixed merge conflict
Fixed merge conflict
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ab5c0595
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ab5c0595
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ab5c0595
Branch: refs/heads/master
Commit: ab5c0595b64bdcaab41a604552f10dfa695e1f78
Parents: 927b5a2 7d5c11d
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Sep 8 17:50:26 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Sep 8 17:50:26 2016 +0700
----------------------------------------------------------------------
src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ab5c0595/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
----------------------------------------------------------------------
diff --cc src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
index cc18216,49ef7d4..007ece1
--- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
@@@ -540,7 -542,7 +539,6 @@@ namespace Lucene.Net.QueryParser.Surrou
public void OptionalWeights(SrndQuery q)
{
Token weight = null;
-
-
while (true)
{
switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)