Resolved merge conflicts over line endings on merge.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/71fcf0ec Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/71fcf0ec Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/71fcf0ec Branch: refs/heads/master Commit: 71fcf0ec6711ee026e59eb59e57b96d3f1213703 Parents: dd3a18d b1ab76e Author: Chris Graham <chrisgw...@apache.org> Authored: Sat May 9 16:23:36 2015 +1000 Committer: Chris Graham <chrisgw...@apache.org> Committed: Sat May 9 16:23:36 2015 +1000 ---------------------------------------------------------------------- ----------------------------------------------------------------------
