Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflicts: .gitignore NOTES.md docs/allclasses-frame.html docs/allclasses-noframe.html docs/constant-values.html docs/deprecated-list.html docs/help-doc.html docs/index-files/index-1.html docs/index-files/index-10.html docs/index-files/index-11.html docs/index-files/index-12.html docs/index-files/index-13.html docs/index-files/index-14.html docs/index-files/index-15.html docs/index-files/index-16.html docs/index-files/index-2.html docs/index-files/index-3.html docs/index-files/index-4.html docs/index-files/index-5.html docs/index-files/index-6.html docs/index-files/index-7.html docs/index-files/index-8.html docs/index-files/index-9.html docs/index.html docs/overview-frame.html docs/overview-summary.html docs/overview-tree.html docs/package-list docs/pt/ptcris/ORCIDClient.html docs/pt/ptcris/ORCIDClientImpl.html docs/pt/ptcris/PTCRISGrouper.html docs/pt/ptcris/PTCRISync.html docs/pt/ptcris/PTCRISyncResult.html docs/pt/ptcris/class-use/ORCIDClient.html docs/pt/ptcris/class-use/ORCIDClientImpl.html docs/pt/ptcris/class-use/PTCRISGrouper.html docs/pt/ptcris/class-use/PTCRISync.html docs/pt/ptcris/class-use/PTCRISyncResult.html docs/pt/ptcris/exceptions/InvalidActivityException.html docs/pt/ptcris/exceptions/class-use/InvalidActivityException.html docs/pt/ptcris/exceptions/package-frame.html docs/pt/ptcris/exceptions/package-summary.html docs/pt/ptcris/exceptions/package-tree.html docs/pt/ptcris/exceptions/package-use.html docs/pt/ptcris/grouper/ActivityComparator.html docs/pt/ptcris/grouper/ActivityGroup.html docs/pt/ptcris/grouper/GroupGenerator.html docs/pt/ptcris/grouper/class-use/ActivityComparator.html docs/pt/ptcris/grouper/class-use/ActivityGroup.html docs/pt/ptcris/grouper/class-use/GroupGenerator.html docs/pt/ptcris/grouper/package-frame.html docs/pt/ptcris/grouper/package-summary.html docs/pt/ptcris/grouper/package-tree.html docs/pt/ptcris/grouper/package-use.html docs/pt/ptcris/handlers/ProgressHandler.html docs/pt/ptcris/handlers/class-use/ProgressHandler.html docs/pt/ptcris/handlers/package-frame.html docs/pt/ptcris/handlers/package-summary.html docs/pt/ptcris/handlers/package-tree.html docs/pt/ptcris/handlers/package-use.html docs/pt/ptcris/package-frame.html docs/pt/ptcris/package-summary.html docs/pt/ptcris/package-tree.html docs/pt/ptcris/package-use.html docs/pt/ptcris/utils/ExternalIdsDiff.html docs/pt/ptcris/utils/ORCIDFundingHelper.html docs/pt/ptcris/utils/ORCIDHelper.html docs/pt/ptcris/utils/ORCIDWorkHelper.html docs/pt/ptcris/utils/UpdateRecord.html docs/pt/ptcris/utils/class-use/ExternalIdsDiff.html docs/pt/ptcris/utils/class-use/ORCIDFundingHelper.html docs/pt/ptcris/utils/class-use/ORCIDHelper.html docs/pt/ptcris/utils/class-use/ORCIDWorkHelper.html docs/pt/ptcris/utils/class-use/UpdateRecord.html docs/pt/ptcris/utils/package-frame.html docs/pt/ptcris/utils/package-summary.html docs/pt/ptcris/utils/package-tree.html docs/pt/ptcris/utils/package-use.html docs/script.js docs/serialized-form.html docs/stylesheet.css pom.xml src/main/java/pt/ptcris/ORCIDClientImpl.java src/main/java/pt/ptcris/PTCRISync.java src/main/java/pt/ptcris/grouper/ActivityComparator.java src/main/java/pt/ptcris/utils/ORCIDFundingHelper.java src/main/java/pt/ptcris/utils/ORCIDHelper.java src/main/java/pt/ptcris/utils/ORCIDWorkHelper.java src/test/java/pt/ptcris/test/PTCRISExample.java src/test/java/pt/ptcris/test/TestClients.java src/test/java/pt/ptcris/test/TestHelper.java src/test/java/pt/ptcris/test/scenarios/Scenario.java src/test/java/pt/ptcris/test/scenarios/ScenarioFunding.java
- Loading branch information