merge issues

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / name / e4 / container / ContainerFactoryE4.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java
index 57c38c03af841134d449feff8462970676713da4..2f70d7d316bfef01c94dd5d5142dd70d255cc588 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java
@@ -79,7 +79,11 @@ public class ContainerFactoryE4 {
                TaxonNameEditorE4 taxonNameEditor) {
                MisappliedGroupE4 group = taxonNameEditor.getMisappliedGroup();
                Taxon taxon = HibernateProxyHelper.deproxy(taxonNameEditor.getTaxon(), Taxon.class);
+<<<<<<< Updated upstream
                if(taxon.getMisappliedNames(true).isEmpty() && taxon.getProParteAndPartialSynonyms().isEmpty()){
+=======
+               if(taxon.getMisappliedNames(true).isEmpty() && taxon.getProParteAndPartialSynonyms().isEmpty() ){
+>>>>>>> Stashed changes
                        taxonNameEditor.removeGroup(group);
                        taxonNameEditor.setMisapplicationsGroup(null);
                }else{