From 5799cecd533f78993b001ca13883bf01c623baed Mon Sep 17 00:00:00 2001
From: Austin Szema <aszema16@gmail.com>
Date: Fri, 10 Nov 2023 23:23:09 -0500
Subject: [PATCH] Fixing merge errors

---
 .../ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset | 4 ++--
 Source/jumpingship/jumpingshipGameMode.cpp                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset
index 33b3a37..6682419 100644
--- a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset
+++ b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4959ee7db88dbeea85c7870a8a24c2dcc15d7fab51514c4d2872468e61931922
-size 180769
+oid sha256:f483a99c475e8d7442358b691b9748f5346db87c13cf86d0af5a3b307d677743
+size 179895
diff --git a/Source/jumpingship/jumpingshipGameMode.cpp b/Source/jumpingship/jumpingshipGameMode.cpp
index 8a49017..562ad2d 100644
--- a/Source/jumpingship/jumpingshipGameMode.cpp
+++ b/Source/jumpingship/jumpingshipGameMode.cpp
@@ -7,7 +7,7 @@
 AjumpingshipGameMode::AjumpingshipGameMode()
 {
 	// set default pawn class to our Blueprinted character
-	static ConstructorHelpers::FClassFinder<APawn> PlayerPawnBPClass(TEXT("/Game/ThirdPerson/Blueprints/BP_ThirdPersonCharacter"));
+	static ConstructorHelpers::FClassFinder<APawn> PlayerPawnBPClass(TEXT("/Game/ThirdPerson/Blueprints/BP_ThirdPersonCharacterJoel"));
 	if (PlayerPawnBPClass.Class != NULL)
 	{
 		DefaultPawnClass = PlayerPawnBPClass.Class;