removed some dead, commented-out code. #3348

IQSS · Sep 8, 2017 · b3a6a33 · b3a6a33
1 parent 4d65715
commit b3a6a33
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
@@ -522,9 +522,7 @@ public String checkDatasetLockInfo(Long datasetId) {
     }
 
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-/*<<<<<<< HEAD
-    public DatasetLock addDatasetLock(Long datasetId, Long userId, String info) {
-=======*/
+
     public DatasetLock addDatasetLock(Dataset dataset, DatasetLock lock) {
        dataset.setDatasetLock(lock);
        em.persist(lock);
@@ -533,7 +531,6 @@ public DatasetLock addDatasetLock(Dataset dataset, DatasetLock lock) {
 
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) /*?*/
     public DatasetLock addDatasetLock(Long datasetId, DatasetLock.Reason reason, Long userId, String info) {
-/*>>>>>>> develop*/
 
         Dataset dataset = em.find(Dataset.class, datasetId);
         DatasetLock lock = new DatasetLock(reason, dvRequestService.getDataverseRequest().getAuthenticatedUser());
@@ -550,13 +547,7 @@ public DatasetLock addDatasetLock(Long datasetId, DatasetLock.Reason reason, Lon
             user.getDatasetLocks().add(lock);
         }
 
-/*<<<<<<< HEAD
-        dataset.setDatasetLock(lock);
-        em.persist(lock);
-        return lock; 
-=======*/
         return addDatasetLock(dataset, lock);
-/*>>>>>>> develop*/
     }
 
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)