chore: fix conflicts

Signed-off-by: Dori Medini <[email protected]>

.github/actions/install_rust/action.yml

@@ -12,14 +12,9 @@ runs:
     - uses: moonrepo/setup-rust@v1
       with:
         cache-base: main(-v[0-9].*)?
-<<<<<<< HEAD
         inherit-toolchain: true
         bins: [email protected], cargo-machete
         # Install additional non-default toolchains (for rustfmt for example), NOP if input omitted.
         channel: ${{ inputs.extra_rust_toolchains }}
       env:
         RUSTFLAGS: "-C link-arg=-fuse-ld=lld"
-||||||| 1e8d3f91b
-=======
-        inherit-toolchain: true
->>>>>>> origin/main-v0.13.2

Cargo.toml

@@ -96,30 +96,14 @@ byteorder = "1.4.3"
 bytes = "1"
 cached = "0.44.0"
 cairo-felt = "0.9.1"
-<<<<<<< HEAD
 cairo-lang-casm = "2.10.0-rc.1"
 cairo-lang-runner = "2.10.0-rc.1"
 cairo-lang-sierra = "=2.10.0-rc.1"
 cairo-lang-sierra-to-casm = "2.10.0-rc.1"
 cairo-lang-starknet-classes = "2.10.0-rc.1"
 cairo-lang-utils = "2.10.0-rc.1"
 cairo-native = { git = "https://github.com/lambdaclass/cairo_native", rev = "981093a" }
-cairo-vm = "=1.0.1"
-||||||| 1e8d3f91b
-cairo-lang-casm = "2.7.0"
-cairo-lang-runner = "2.7.0"
-cairo-lang-sierra = "=2.7.0"
-cairo-lang-starknet-classes = "2.7.0"
-cairo-lang-utils = "2.7.0"
-cairo-vm = "=1.0.1"
-=======
-cairo-lang-casm = "2.7.0"
-cairo-lang-runner = "2.7.0"
-cairo-lang-sierra = "=2.7.0"
-cairo-lang-starknet-classes = "2.7.0"
-cairo-lang-utils = "2.7.0"
 cairo-vm = "=1.0.2"
->>>>>>> origin/main-v0.13.2
 camelpaste = "0.1.0"
 chrono = "0.4.26"
 clap = "4.5.4"