oops, forgot to resolve a conflict..

fcrepo4-archive · Jan 18, 2013 · 1ee74b0 · 1ee74b0
1 parent bd917fc
commit 1ee74b0
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraDatastreams.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraDatastreams.java
@@ -9,22 +9,12 @@
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-<<<<<<< HEAD
 import javax.jcr.lock.LockException;
 import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.version.VersionException;
 import javax.jcr.version.VersionManager;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-=======
 import javax.ws.rs.*;
->>>>>>> datastreams tesst
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
@@ -146,7 +136,7 @@ private Node addDatastreamNode(final String dspath,
 			PathNotFoundException, NoSuchNodeTypeException, LockException,
 			VersionException, ConstraintViolationException, RepositoryException {
 		final Node ds = session.getRootNode().addNode(dspath,
-				"fedora:datastream");
+                "fedora:datastream");
 		ds.addMixin("fedora:owned");
 		ds.setProperty("fedora:ownerId", "Fedo Radmin");
 		ds.setProperty("fedora:contentType", contentType.toString());