fix ci

Author: tgross35

ci/run.sh

@@ -120,16 +120,8 @@ done
 
 rm -f "${rlib_paths[@]}"
 
-<<<<<<< HEAD
 build_intrinsics_test() {
     cargo build --target "$target" -v --package builtins-test-intrinsics "$@"
-||||||| parent of c85df06 (move)
-build_intrinsics() {
-    cargo build --target "$target" -v --example intrinsics  "$@"
-=======
-build_intrinsics() {
-    cargo build --target "$target" -v --package builtins-test-intrinsics  "$@"
->>>>>>> c85df06 (move)
 }
 
 # Verify that we haven't dropped any intrinsics/symbols

crates/panic-handler/Cargo.toml

@@ -5,7 +5,6 @@ authors = ["Alex Crichton <[email protected]>"]
 edition = "2024"
 publish = false
 
-
 [lib]
 test = false
 bench = false