ruby/proto/gitaly/conflicts_pb.rb in gitaly-14.4.0.pre.rc43 vs ruby/proto/gitaly/conflicts_pb.rb in gitaly-14.6.0.pre.rc1
- old
+ new
@@ -1,12 +1,12 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: conflicts.proto
-require 'google/protobuf'
-
require 'lint_pb'
require 'shared_pb'
require 'google/protobuf/timestamp_pb'
+require 'google/protobuf'
+
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