fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/commit/97317c4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/97317c4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/97317c4d Branch: refs/heads/master Commit: 97317c4df540a58d07756751f73dfd3ff507c36d Parents: 6e10024 268ed13 Author: Lisa Owen <[email protected]> Authored: Wed Sep 28 09:39:18 2016 -0700 Committer: Lisa Owen <[email protected]> Committed: Wed Sep 28 09:39:18 2016 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------
