You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tika.apache.org by ma...@apache.org on 2016/03/02 06:42:27 UTC

[18/20] tika git commit: resolved conflicts

resolved conflicts


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/e147de34
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/e147de34
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/e147de34

Branch: refs/heads/master
Commit: e147de3429b775f5036c78b18a1cb688971be0af
Parents: 0dbd69c cdb684d
Author: manali <ma...@gmail.com>
Authored: Tue Mar 1 01:05:34 2016 -0800
Committer: manali <ma...@gmail.com>
Committed: Tue Mar 1 01:05:34 2016 -0800

----------------------------------------------------------------------
 .../apache/tika/sax/RichTextContentHandler.java | 58 ++++++++++++++++++++
 .../tika/server/RichTextContentHandler.java     | 58 --------------------
 2 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------