Merge branch 'fix/unixfs-pb-collision' into feat/reduce-globals

ipfs · May 30, 2023 · 537e24a · 537e24a
2 parents cc1b63d + 31895f1
commit 537e24a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/ipld/unixfs/pb/unixfs.pb.go b/ipld/unixfs/pb/unixfs.pb.go
diff --git a/ipld/unixfs/pb/unixfs.proto b/ipld/unixfs/pb/unixfs.proto
@@ -1,6 +1,8 @@
 syntax = "proto2";
 
-package unixfs.pb;
+package unixfs.v1.pb;
+
+option go_package = "unixfs_pb";
 
 message Data {
 	enum DataType {