fixed merge conflicts

2023-11-16 03:09:42 +01:00
parent 53ba18c157 86a7bf7317
commit 851c7b7587
21 changed files with 2869 additions and 387 deletions
--- a/examples/android/Cargo.toml
+++ b/examples/android/Cargo.toml
@@ -24,6 +24,11 @@ strip = "strip"
 [package.metadata.android.sdk]
 target_sdk_version = 32

+
+[target.'cfg(not(target_os="android"))'.dependencies.bevy_oxr]
+path = "../../"
+default-features = true
+
 # [package.metadata.android.application]
 # icon = "@mipmap/ic_launcher"
 # label = "Bevy Example"