Fix

ddelnano · ddelnano · commit ac8e59346d78 · 2025-04-23T20:00:58.000Z
Signed-off-by: Dom Del Nano &lt;ddelnano@gmail.com&gt;
diff --git a/third_party/gogoproto/BUILD.bazel b/third_party/gogoproto/BUILD.bazel
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Copyright 2018- The Pixie Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-=======
->>>>>>> 5c7876bef (Use third_party provided gogo proto file)
 # Create filegroup with a name bazel
 filegoup = filegroup(
     name = "bazel",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`# Copyright 2018- The Pixie Authors.`
`3`	`2`	`#`
`4`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`@@ -15,8 +14,6 @@`
`15`	`14`	`#`
`16`	`15`	`# SPDX-License-Identifier: Apache-2.0`
`17`	`16`
`18`		`-=======`
`19`		`->>>>>>> 5c7876bef (Use third_party provided gogo proto file)`
`20`	`17`	`# Create filegroup with a name bazel`
`21`	`18`	`filegoup = filegroup(`
`22`	`19`	`name = "bazel",`