From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 10 Jul 2015 10:42:07 +0000 (+0200)
Subject: Merge branch 'develop' into remoting-4.0
X-Git-Tag: remoting-3.9.0~95
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/8686ea007266b27aef522a8a7f1f4e0e4c5e7844

Merge branch 'develop' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
---

8686ea007266b27aef522a8a7f1f4e0e4c5e7844
diff --cc eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index b613952f6,ee3cd44ef..9f3dbc63a
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@@ -63,7 -67,7 +67,7 @@@ import eu.etaxonomy.taxeditor.view.Abst
   * @created 08.07.2009
   * @version 1.0
   */
--public class ReferencingObjectsView extends AbstractCdmViewPart{
++public class ReferencingObjectsView extends AbstractCdmViewPart {
  	private static final Logger logger = Logger
  			.getLogger(ReferencingObjectsView.class);