--- projects/cms/documentation/specification/protocols.txt	2001/01/28 20:16:19	1.4
+++ projects/cms/documentation/specification/protocols.txt	2001/01/28 20:29:32	1.5
@@ -71,7 +71,14 @@ Host         (direction) Server         Comment
              <---------- [{lastmodified}Returns a long int
                          |ERROR]        time since epoch
                                         eg, 123456789
-
+                                        To indicate what
+                                        format this is in,
+                                        I quote from the
+                                        Java 1.3 JDK API
+                                        "measured in milli
+                                        -seconds since the
+                                        epoch"
+                                        
 [FILELIST]   ---------->                Asks the server for
                                         the list of files
                                         that were used to
@@ -151,12 +158,8 @@ Host         (direction) Server         Comment
                                         server is either ok
                                         or that it thought
                                         there was an error
-<<<<<<< protocols.txt
 ------------------------------------------------------------
-
-=======
        
->>>>>>> 1.2
 Host Heartbeat Protocol
 -----------------------
 When a host is configured after it has connected it should
@@ -205,6 +208,13 @@ Host            (direction) Server      Comment
                                         identical to the one
                                         received in the
                                         connection protocol
+                                        To indicate what
+                                        format this is in,
+                                        I quote from the
+                                        Java 1.3 JDK API
+                                        "measured in milli
+                                        -seconds since the
+                                        epoch"
 
                 <---------- [OK|ERROR]  The server then
                                         checks all the files