conflicts_pb.rb in gitaly-13.9.0.pre.rc1

- old
+ new

@@ -3,10 +3,11 @@
 
 require 'google/protobuf'
 
 require 'lint_pb'
 require 'shared_pb'
+require 'google/protobuf/timestamp_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("conflicts.proto", :syntax => :proto3) do
     add_message "gitaly.ListConflictFilesRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :our_commit_oid, :string, 2
@@ -35,9 +36,10 @@
       optional :their_commit_oid, :string, 4
       optional :source_branch, :bytes, 5
       optional :target_branch, :bytes, 6
       optional :commit_message, :bytes, 7
       optional :user, :message, 8, "gitaly.User"
+      optional :timestamp, :message, 9, "google.protobuf.Timestamp"
     end
     add_message "gitaly.ResolveConflictsRequest" do
       oneof :resolve_conflicts_request_payload do
         optional :header, :message, 1, "gitaly.ResolveConflictsRequestHeader"
         optional :files_json, :bytes, 2