merge conflct

marci1175 · Aug 17, 2024 · 4cc4da3 · 4cc4da3
2 parents 851204a + 95f2b40
commit 4cc4da3
Show file tree

Hide file tree

Showing 11 changed files with 219 additions and 218 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,4 +3,4 @@
 members = [
     "desktop",
     "mobile",
-]
+]
diff --git a/build_info.matthias_build b/build_info.matthias_build
@@ -0,0 +1 @@
+2024.08.16. 21:25
diff --git a/desktop/rust-toolchain.toml b/desktop/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 components = [ "rustfmt", "clippy", "rustc", "rust-docs", "rust-analyzer" ]
-targets = [ "x86_64-linux-android" ]
+targets = [ "x86_64-linux-android" ]