luetzkendorf 2004/09/22 08:15:43
Modified: src/webdav/server/org/apache/slide/webdav/method
AbstractWebdavMethod.java
Log:
oops, have overseen some conflict
Revision Changes Path
1.50 +3 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java
Index: AbstractWebdavMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- AbstractWebdavMethod.java 22 Sep 2004 15:13:53 -0000 1.49
+++ AbstractWebdavMethod.java 22 Sep 2004 15:15:43 -0000 1.50
@@ -1793,7 +1793,4 @@
return result;
}
}
-<<<<<<< AbstractWebdavMethod.java
}
-=======
-}>>>>>>> 1.43.2.7
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
