[2/2] maven-scm git commit: Resolved merge conflicts over line endings on merge.

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/repo

[1/2] maven-scm git commit: Change: Added consume

Repository: maven-scm Updated Branches: refs/heads/master dd3a18d05 -> 71fcf0ec6 Change: Added consume Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/b1ab76eb Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/

svn commit: r1678448 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/preparing-dependencies.apt

Author: khmarbaise Date: Fri May 8 21:03:42 2015 New Revision: 1678448 URL: http://svn.apache.org/r1678448 Log: [MDEP-487] Documentation cleanup The preparing-dependencies references upgrade to Maven 2.0.6 which is out of scope. Removed: maven/plugins/trunk/maven-dependency-plugin/src/sit