Skip to content

Commit 5205954

Browse files
committed
resolve merge conflicts in Guestbook.java
These were introduced in #12043
1 parent 18a462e commit 5205954

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

src/main/java/edu/harvard/iq/dataverse/Guestbook.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,19 @@
44
import edu.harvard.iq.dataverse.util.BundleUtil;
55
import edu.harvard.iq.dataverse.util.DateUtil;
66
import jakarta.persistence.*;
7-
import org.hibernate.validator.constraints.NotBlank;
87

98
import java.io.Serializable;
109
import java.util.ArrayList;
1110
import java.util.Date;
1211
import java.util.List;
1312
import java.util.Objects;
14-
<<<<<<< IQSS/12020-Payara7_Java21_update
1513
import jakarta.persistence.Column;
1614
import jakarta.persistence.ManyToOne;
1715
import jakarta.persistence.OrderBy;
1816
import jakarta.persistence.Temporal;
1917
import jakarta.persistence.TemporalType;
2018
import jakarta.persistence.Transient;
2119
import jakarta.validation.constraints.NotBlank;
22-
import edu.harvard.iq.dataverse.util.DateUtil;
23-
=======
24-
>>>>>>> develop
2520

2621
/**
2722
*

0 commit comments

Comments
 (0)