Update ci

lambdaclass · Dec 2, 2024 · 3b94a64 · 3b94a64
1 parent fab80a2
commit 3b94a64
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,11 +19,7 @@ jobs:
       MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/
       LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/
       TABLEGEN_190_PREFIX: /usr/lib/llvm-19/
-<<<<<<< HEAD
-      CAIRO_NATIVE_RUNTIME_LIBRARY: replay/libcairo_native_runtime.a
-=======
       CAIRO_NATIVE_RUNTIME_LIBRARY: libcairo_native_runtime.a
->>>>>>> 61026698d52a6ad242ae08478a927a37c22eacda
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@1.82.0