Upgrading rust version

Pauan · Pauan · commit 272d8152d498 · 2025-09-14T18:49:56.000-07:00
diff --git a/.github/workflows/staging-website.yml b/.github/workflows/staging-website.yml
@@ -18,7 +18,11 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
+<<<<<<< HEAD
           toolchain: nightly-2025-08-28
+=======
+          toolchain: nightly-2025-08-15
+>>>>>>> 3a6e8884 (Upgrading rust version)
           override: true
           components: rustfmt, rust-src
 
diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
@@ -15,7 +15,11 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
+<<<<<<< HEAD
           toolchain: nightly-2025-08-28
+=======
+          toolchain: nightly-2025-08-15
+>>>>>>> 3a6e8884 (Upgrading rust version)
           override: true
           components: rustfmt, rust-src
 
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -18,7 +18,11 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
+<<<<<<< HEAD
           toolchain: nightly-2025-08-28
+=======
+          toolchain: nightly-2025-08-15
+>>>>>>> 3a6e8884 (Upgrading rust version)
           override: true
           components: rustfmt, rust-src
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,8 @@
 [toolchain]
+<<<<<<< HEAD
 channel = "nightly-2025-08-28"
+=======
+channel = "nightly-2025-08-15"
+>>>>>>> 3a6e8884 (Upgrading rust version)
 components = [ "rust-std", "rust-src" ]
 targets = [ "wasm32-unknown-unknown" ]
