Merge fix for merge error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b7ecf18f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b7ecf18f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b7ecf18f Branch: refs/heads/master Commit: b7ecf18f91dd29fb60bcb49af925ef4b100f8ab7 Parents: ff2b62c e913bdb Author: Dave Birdsall <[email protected]> Authored: Wed Apr 6 23:31:26 2016 +0000 Committer: Dave Birdsall <[email protected]> Committed: Wed Apr 6 23:31:26 2016 +0000 ---------------------------------------------------------------------- install/installer/rest_installer | 1 - install/installer/traf_hortonworks_mods98 | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
