You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by yo...@apache.org on 2016/09/29 17:23:01 UTC
[47/50] [abbrv] incubator-hawq-docs git commit: fix merge conflict
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 <lo...@pivotal.io>
Authored: Wed Sep 28 09:39:18 2016 -0700
Committer: Lisa Owen <lo...@pivotal.io>
Committed: Wed Sep 28 09:39:18 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------