conflict

discord · Sep 23, 2024 · 626695e · 626695e
1 parent d13e1ba
commit 626695e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
@@ -117,9 +117,6 @@
 ^\Qwebsite/cue/reference/remap/functions/ip_pton.cue\E$
 ^\Qwebsite/layouts/shortcodes/config/unit-tests.html\E$
 ^lib/codecs/tests/data/native_encoding/
-<<<<<<< HEAD
 ^\Qwebsite/config.toml\E$
-=======
 ^proto/google/
->>>>>>> b0fb6a4fb (Fix spelling test)
 ignore$
diff --git a/build.rs b/build.rs
@@ -155,6 +155,11 @@ fn main() {
                     "proto/third-party/google/rpc/status.proto",
                     "proto/vector/vector.proto",
                 ],
+                &[
+                    "proto/third-party",
+                    "proto/vector",
+                    "lib/vector-core/proto/",
+                ],
             )
             .unwrap();
     }