Merge [TRAFODION-2803] PR 1301 Fix a merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/997b8631 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/997b8631 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/997b8631 Branch: refs/heads/master Commit: 997b86318c4c9ada2a8a6caef10d0b3fbcc92b39 Parents: 7694a63 ad6d735 Author: Dave Birdsall <[email protected]> Authored: Fri Nov 17 00:59:53 2017 +0000 Committer: Dave Birdsall <[email protected]> Committed: Fri Nov 17 00:59:53 2017 +0000 ---------------------------------------------------------------------- core/sql/common/ComSmallDefs.h | 2 +- core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
