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/07/16 21:46:57 UTC
[3/3] lucenenet git commit: Merge remote-tracking branch
'origin/master' into analysis-work
Merge remote-tracking branch 'origin/master' into analysis-work
# Conflicts:
# src/Lucene.Net.Core/packages.config
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2561993d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2561993d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2561993d
Branch: refs/heads/analysis-work
Commit: 2561993d7e11d9e8933c0f5e1cb1bf2737b1f9d2
Parents: 30804e0 1d8582f
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Sat Jul 16 23:46:41 2016 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Sat Jul 16 23:46:41 2016 +0300
----------------------------------------------------------------------
src/Lucene.Net.Core/Lucene.Net.csproj | 4 ++++
src/Lucene.Net.Core/packages.config | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2561993d/src/Lucene.Net.Core/packages.config
----------------------------------------------------------------------
diff --cc src/Lucene.Net.Core/packages.config
index 6b8deb9,5d1cb40..aade4f9
--- a/src/Lucene.Net.Core/packages.config
+++ b/src/Lucene.Net.Core/packages.config
@@@ -1,3 -1,4 +1,4 @@@
\ufeff<?xml version="1.0" encoding="utf-8"?>
<packages>
- </packages>
+ <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net451" />
-</packages>
++</packages>