Fix merge issues

1 files changed, 12 insertions, 12 deletions

diff --git a/src/example/StartSubScene.cpp b/src/example/StartSubScene.cpp
index 9006dc7..e943396 100644
--- a/src/example/StartSubScene.cpp
+++ b/src/example/StartSubScene.cpp
@@ -161,7 +161,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.5, 0.6),
 		.angular_velocity = 500,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_1_rb.active = false;
 	frag_1.add_component<CircleCollider>(25);
@@ -181,7 +181,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.35, 0.4),
 		.angular_velocity = 400,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_2_rb.active = false;
 	frag_2.add_component<CircleCollider>(55);
@@ -201,7 +201,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.3, 0.3),
 		.angular_velocity = 300,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_3_rb.active = false;
 	frag_3.add_component<CircleCollider>(35);
@@ -221,7 +221,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.2, 0.2),
 		.angular_velocity = 200,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_4_rb.active = false;
 	frag_4.add_component<CircleCollider>(60);
@@ -241,7 +241,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.25, 0.15),
 		.angular_velocity = 100,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_5_rb.active = false;
 	frag_5.add_component<CircleCollider>(5);
@@ -261,7 +261,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.35, 0.25),
 		.angular_velocity = 100,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_6_rb.active = false;
 	frag_6.add_component<CircleCollider>(30);
@@ -281,7 +281,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.45, 0.6),
 		.angular_velocity = 800,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_7_rb.active = false;
 	frag_7.add_component<CircleCollider>(45);
@@ -301,7 +301,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.5, 0.6),
 		.angular_velocity = 500,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_8_rb.active = false;
 	frag_8.add_component<CircleCollider>(25);
@@ -321,7 +321,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.5, 0.25),
 		.angular_velocity = 500,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_9_rb.active = false;
 	frag_9.add_component<CircleCollider>(15);
@@ -341,7 +341,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.35, 0.4),
 		.angular_velocity = 300,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_10_rb.active = false;
 	frag_10.add_component<CircleCollider>(60);
@@ -361,7 +361,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.3, 0.3),
 		.angular_velocity = 200,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_11_rb.active = false;
 	frag_11.add_component<CircleCollider>(5);
@@ -381,7 +381,7 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.linear_velocity_coefficient = vec2(0.25, 0.15),
 		.angular_velocity = 100,
 		.angular_velocity_coefficient = 0.55,
-		.elastisity_coefficient = 0.5,
+		.elasticity_coefficient = 0.5,
 	});
 	frag_12_rb.active = false;
 	frag_12.add_component<CircleCollider>(50);