commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chtom...@apache.org
Subject [13/14] [text] TEXT-23: Resolving merge conflict in changes.xml
Date Sun, 13 Nov 2016 20:34:16 GMT
TEXT-23: Resolving merge conflict in changes.xml


Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/56c0a072
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/56c0a072
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/56c0a072

Branch: refs/heads/master
Commit: 56c0a0728f80241d550a070e43fc60ec80d0b806
Parents: 3aa96d4 c8a803c
Author: Rob Tompkins <christopher.tompkins@capitalone.com>
Authored: Wed Nov 9 20:46:18 2016 -0500
Committer: Rob Tompkins <christopher.tompkins@capitalone.com>
Committed: Wed Nov 9 20:46:18 2016 -0500

----------------------------------------------------------------------
 src/changes/changes.xml                         |   1 +
 .../similarity/LevenshteinDetailedDistance.java | 513 +++++++++++++++++++
 .../text/similarity/LevenshteinResults.java     | 125 +++++
 .../LevenshteinDetailedDistanceTest.java        | 402 +++++++++++++++
 4 files changed, 1041 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-text/blob/56c0a072/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index c3d78da,45825e7..e60b364
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -22,7 -22,7 +22,8 @@@
    <body>
  
    <release version="1.0" date="tba" description="tba">
 +    <action issue="TEXT-23" type="add" dev="chtompki">Moving from commons-lang, the
package org.apache.commons.lang3.text</action>
+     <action issue="TEXT-10" type="add" dev="kinow" due-to="Don Jeba">A more complex
Levenshtein distance</action>
      <action issue="TEXT-24" type="add" dev="chtompki">Add coveralls and Travis.ci
integration</action>
      <action issue="TEXT-19" type="add" dev="kinow" due-to="Eyal Allweil">Add alphabet
converter</action>
      <action issue="TEXT-13" type="add" dev="kinow">Create Commons Text logo</action>


Mime
View raw message