Revert "update strategy doc"

This reverts commit ca4adae.

schema/daemon.proto

@@ -182,7 +182,6 @@ message IncomingMaybeFriend {
 }
 
 message IncomingMessage {
-<<<<<<< Updated upstream
   int32 uid = 1;
   string message = 2;
 
@@ -209,19 +208,6 @@ message OutgoingMessage {
 
   repeated OutgoingFriend to_friends = 3;
   google.protobuf.Timestamp sent_at = 4;
-=======
-    BaseMessage m = 1;
-    google.protobuf.Timestamp delivered_at = 2;
-    bool seen = 3;
-    bool delivered = 4;
-}
-
-message OutgoingMessage {
-    BaseMessage m = 1;
-    google.protobuf.Timestamp sent_at = 2;
-    bool delivered = 3;
-    google.protobuf.Timestamp delivered_at = 4;
->>>>>>> Stashed changes
 }
 
 message GetMessagesRequest {
@@ -242,30 +228,17 @@ message GetSentMessagesRequest {}
 
 message GetSentMessagesResponse { repeated OutgoingMessage messages = 1; }
 
-<<<<<<< Updated upstream
 message MessageSeenRequest { int32 id = 1; }
-=======
-message MessageSeenRequest {
-    int32 id = 1;
-}
->>>>>>> Stashed changes
 
 message MessageSeenResponse {}
 
 message GetStatusRequest {}
 
 message GetStatusResponse {
-<<<<<<< Updated upstream
   bool registered = 1;
   string release_hash = 2;
   int32 latency_seconds = 3;
   string server_address = 4;
-=======
-    bool registered = 1;
-    string release_hash = 2;
-    int32 latency_seconds = 3;
-    string server_address = 4;
->>>>>>> Stashed changes
 }
 
 message GetLatencyRequest {}