ref #7362 Fix merge compile error
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 16 May 2018 04:35:30 +0000 (06:35 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 16 May 2018 04:35:30 +0000 (06:35 +0200)
commit40268e87f3866227587869e871a7673fdb510326
tree5790678bbd94c2f30d721594c0160ad968c0eb3f
parente759655c22ad154f93fb7f76b16d19a87a58384c
ref #7362 Fix merge compile error
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/requests/RequestSearch.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/requests/TerminologyServiceConstants.java