Repository: oodt Updated Branches: refs/heads/asf-site 268fe5713 -> d4d18f411
Fix merge conflict. Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d4d18f41 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d4d18f41 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d4d18f41 Branch: refs/heads/asf-site Commit: d4d18f41185462d29158b150fd07e98c5f8c7866 Parents: 268fe57 Author: Chris Mattmann <chris.a.mattm...@jpl.nasa.gov> Authored: Sun Feb 4 22:40:06 2018 -0800 Committer: Chris Mattmann <chris.a.mattm...@jpl.nasa.gov> Committed: Sun Feb 4 22:40:06 2018 -0800 ---------------------------------------------------------------------- download.html | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/d4d18f41/download.html ---------------------------------------------------------------------- diff --git a/download.html b/download.html index 83d3fdc..ea8a123 100644 --- a/download.html +++ b/download.html @@ -110,7 +110,6 @@ </tr> <tr> <td> -<<<<<<< HEAD Apache OODT 1.2.1 (zip) </td> <td>
