Lucene.Net.sln: 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/fd43c504 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/fd43c504 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/fd43c504 Branch: refs/heads/replicator Commit: fd43c50433f3c6dc20c850ccdc25849031c66348 Parents: 3b0e132 Author: Shad Storhaug <[email protected]> Authored: Thu Aug 17 02:52:00 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Thu Aug 17 02:52:00 2017 +0700 ---------------------------------------------------------------------- Lucene.Net.sln | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fd43c504/Lucene.Net.sln ---------------------------------------------------------------------- diff --git a/Lucene.Net.sln b/Lucene.Net.sln index 470a270..2fa6d04 100644 --- a/Lucene.Net.sln +++ b/Lucene.Net.sln @@ -111,6 +111,7 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net.Replicator.AspNetCore", "src\Lucene.Net.Replicator.AspNetCore\Lucene.Net.Replicator.AspNetCore.csproj", "{763CCB5A-E397-456A-AF47-7C6E228B1852}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net.Tests.Replicator", "src\Lucene.Net.Tests.Replicator\Lucene.Net.Tests.Replicator.csproj", "{418E9D8E-2369-4B52-8D2F-5A987213999B}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net.Analysis.Kuromoji", "src\Lucene.Net.Analysis.Kuromoji\Lucene.Net.Analysis.Kuromoji.csproj", "{8408625A-2508-46D5-8519-045183C43724}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net.Tests.Analysis.Kuromoji", "src\Lucene.Net.Tests.Analysis.Kuromoji\Lucene.Net.Tests.Analysis.Kuromoji.csproj", "{34A2BCE8-1351-43BD-A365-F50E7C0B2C49}"
