fixed merge conflicts

examples/demo/Cargo_back.toml

@@ -0,0 +1,24 @@
+[package]
+name = "demo"
+version = "0.1.0"
+edition = "2021"
+
+
+[lib]
+crate-type = ["cdylib", "lib"]
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bevy = { git = "https://github.com/bevyengine/bevy.git" }
+# bevy = "0.11.3"
+# default-features is false because it for some reason complains when trying to statically link openxr
+bevy_oxr = { path = "../../" }
+# bevy_openxr = { git = "https://github.com/Schmarni-Dev/bevy_openxr", default-features = false, branch = "demo"}
+bevy_rapier3d = { git = "https://github.com/devil-ira/bevy_rapier", version = "0.22.0", branch = "bevy-0.12" }
+# bevy_rapier3d = { git = "https://github.com/Schmarni-Dev/bevy_rapier" }
+color-eyre = "0.6.2"
+
+[profile.release]
+lto = "fat"
+codegen-units = 1
+panic = "abort"