Merge conflict fix
All checks were successful
Rust Build / Check (pull_request) Successful in 29s
Rust Build / Test Suite (pull_request) Successful in 28s
Rust Build / Rustfmt (pull_request) Successful in 27s
Rust Build / Clippy (pull_request) Successful in 33s
Rust Build / build (pull_request) Successful in 29s

This commit is contained in:
KD
2025-03-30 13:02:28 -04:00
2 changed files with 5 additions and 1 deletions

View File

@@ -9,7 +9,11 @@ on:
jobs: jobs:
release: release:
<<<<<<< HEAD
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
=======
runs-on: ubuntu-22.04
>>>>>>> f6fdb717e962116f790b33d960d6fde4abe17710
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3

View File

@@ -1,5 +1,5 @@
[package] [package]
name = "icarus-models" name = "icarus_models"
version = "0.2.0" version = "0.2.0"
edition = "2024" edition = "2024"
description = "models used for the icarus project" description = "models used for the icarus project"