dpsProv/Sandbox — pull request #3 by dpsProv (2012-12-13 13:46:37+00:00)
Title: Conflicts branch

The branch **conflicts-branch** has 3 conflicts:
* add() with 3 parameters is commented out; Subtract's main() references that method.
* add() with 6 parameters is commented out which is referenced in Subtract's main().
* Add includes a main method which references a Subtract method which doesn't exist.

Only Add.java was modified & committed; theses changes gave errors to the **conflicts-branch**.