BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
[taxeditor.git]
/
eu.etaxonomy.taxeditor.editor
/
src
/
main
/
java
/
eu
/
etaxonomy
/
taxeditor
/
editor
/
view
/
dataimport
/
transientServices
/
TransientOccurenceService.java
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index f0d19008105c9d231898f38a8e8830933847ab34..e60f85b87a682d0f53769669be6df783d3586597 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@
-1016,5
+1016,4
@@
public class TransientOccurenceService implements IOccurrenceService {
return defaultService.merge(arg0);
}
return defaultService.merge(arg0);
}
-
}
}