Project

General

Profile

Revision fdd2fa78

IDfdd2fa78995457175ad4f535705eeca0b74634d4
Parent a7e45124
Child f5ac2db4

Added by Andreas Kohlbecker over 3 years ago

cleaning merge problem info in comment

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IMultiLanguageTextHolder.java
17 17
 * a future version.
18 18
 *
19 19
 * @author n.hoffmann
20
<<<<<<< HEAD
21 20
 * @since Dec 2, 2010
22 21
 * @version 1.0
23
=======
24
 * @created Dec 2, 2010
25
>>>>>>> cleanup
26 22
 */
27 23
public interface IMultiLanguageTextHolder {
28 24

  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)