summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-27 03:43:25 +0000
committernw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-27 03:43:25 +0000
commita2adaa8049692bcc4265158b7b40be9e353f6095 (patch)
treef467de8a0d50636c08bb94cf3c7abffb72eaad5a
parentd6fb8589fc0d415482d825c7f420f9f08c1d4d09 (diff)
downloadATCD-a2adaa8049692bcc4265158b7b40be9e353f6095.tar.gz
*** empty log message ***
-rw-r--r--apps/JAWS/clients/Caching/Locator_Request_Reply.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/apps/JAWS/clients/Caching/Locator_Request_Reply.h
index cc53f593b9d..64f7485aa6d 100644
--- a/apps/JAWS/clients/Caching/Locator_Request_Reply.h
+++ b/apps/JAWS/clients/Caching/Locator_Request_Reply.h
@@ -75,7 +75,6 @@ public:
const ACE_URL_Property_Seq &modify = 0);
// Modify a previously registered offer.
-<<<<<<< Locator_Request_Reply.h
int encode (void);
// Encode request for network communication.
@@ -92,7 +91,6 @@ public:
ACE_WString &url (void);
void *buffer (void);
-=======
size_t encode (void);
// Encode request for network communication. If succeed,
// returns the size of the buffer, otherwise, return 0.