claiming copy

chain4travel · Oct 22, 2024 · 43f9774 · 43f9774
1 parent 3ba43de
commit 43f9774
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/proto/cmp/services/transport/v3/trip_types.proto b/proto/cmp/services/transport/v3/trip_types.proto
@@ -142,13 +142,10 @@ message Segment {
 // Represents a departure or arrival event
 message TransitEvent {
   // Date time of the event
-<<<<<<< HEAD
-=======
   //
   // Timestamps may be used for both off-chain and on-chain operations.
   // For on-chain operations, only seconds are supported, and nanoseconds
   // will be ignored.
->>>>>>> f2358d3 (claiming copy)
   google.protobuf.Timestamp date_time = 1;
 
   // Event location