Merge conflict fix

2025-03-30 13:02:28 -04:00
parent b4960fea61 f6fdb717e9
commit 29176b76ed
2 changed files with 5 additions and 1 deletions
--- a/.gitea/workflows/tag_release.yaml
+++ b/.gitea/workflows/tag_release.yaml
@@ -9,7 +9,11 @@ on:

 jobs:
  release:
+<<<<<<< HEAD
    runs-on: ubuntu-24.04
+=======
+    runs-on: ubuntu-22.04
+>>>>>>> f6fdb717e962116f790b33d960d6fde4abe17710
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "icarus-models"
+name = "icarus_models"
 version = "0.2.0"
 edition = "2024"
 description = "models used for the icarus project"