Resolving verification.html conflict
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/f2093dec Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/f2093dec Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/f2093dec Branch: refs/heads/asf-site Commit: f2093decaa51f1cb8a68110fc310995f5382685c Parents: a1037a1 e193e50 Author: sashadt <[email protected]> Authored: Wed Feb 24 11:06:25 2016 -0800 Committer: sashadt <[email protected]> Committed: Wed Feb 24 11:06:25 2016 -0800 ---------------------------------------------------------------------- ----------------------------------------------------------------------
