fixed conflicts

fccn · Nov 30, 2016 · 750d0b8 · 750d0b8
2 parents 21fee19 + 7f0bfa0
commit 750d0b8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/NOTES.md b/NOTES.md
@@ -1,7 +1,7 @@
 Release Notes
 =============
 
-### PTCRISync 1.0 (October, 2016)
+### PTCRISync 1.0 (November, 2016)
 
 * Support for the synchronization of research productions (works)
 * Support for the following synchronization procedures:

diff --git a/README.md b/README.md
@@ -1,15 +1,4 @@
 PTCRISync
 =============
 
-## Release Notes
-### PTCRISync 1.0 (October, 2016)
-
-* Support for the synchronization of research productions (works)
-* Support for the following synchronization procedures:
-  - Export local works
-  - Import novel remote works
-  - Import remote work updates
-  - Import invalid remote works
-  - Import novel remote work counter
-* Built over the ORCID API 2.0rc1
-* Based on the PTCRISync specification v0.5
+This repository contains the source code for [PTCRISync](www.ptcris.pt), synchronization framework for a national CRIS ecosystems based on ORCID. Check out the [wiki](https://github.com/haslab/PTCRISync/wiki) for resources on how to start using PTCRISync.
diff --git a/src/main/java/pt/ptcris/utils/ORCIDHelper.java b/src/main/java/pt/ptcris/utils/ORCIDHelper.java
@@ -629,7 +629,6 @@ else if (work.getTitle().getTitle() == null)
 			else if (work.getPublicationDate().getYear() == null)
 				res.add(INVALID_YEAR);
 		}
-
 		return res;
 	}
 
@@ -677,7 +676,6 @@ else if (work.getTitle().getTitle() == null)
 			else if (work.getPublicationDate().getYear() == null)
 				res.add(INVALID_YEAR);
 		}
-
 		return res;
 	}
 

diff --git a/src/test/java/pt/ptcris/test/TestHelper.java b/src/test/java/pt/ptcris/test/TestHelper.java
@@ -106,7 +106,6 @@ public static Work workOtherOtherDOI(BigInteger key, String meta, String doi, St
 		return work;
 	}
 
-
 	public static Work workHANDLE(BigInteger key, String meta, String handle) {
 		Work work = work(key, meta);