Resolving merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/55be8bcb Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/55be8bcb Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/55be8bcb Branch: refs/heads/asf-site Commit: 55be8bcb03ffa4d90394a8bb1d72b01701e0090e Parents: 3967753 3ca14a5 Author: sashadt <sa...@datatorrent.com> Authored: Mon Apr 25 15:34:56 2016 -0700 Committer: sashadt <sa...@datatorrent.com> Committed: Mon Apr 25 15:34:56 2016 -0700 ---------------------------------------------------------------------- content/announcements.html | 4 ++-- content/community.html | 4 ++-- content/contributing.html | 4 ++-- content/docs.html | 4 ++-- content/downloads.html | 4 ++-- content/index.html | 4 ++-- content/maturity.html | 4 ++-- content/people.html | 4 ++-- content/release.html | 4 ++-- content/roadmap.html | 6 +++--- content/verification.html | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/55be8bcb/content/announcements.html ----------------------------------------------------------------------
