Merge pull request #89 from JulianDev24/patch-1

Update BlocksEditor.Target.cs
CodexLabsLLC · Jul 5, 2024 · 3bbfe9b · 3bbfe9b
2 parents c115fdc + c9c546a
commit 3bbfe9b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
@@ -10,10 +10,7 @@ public BlocksEditorTarget(TargetInfo Target) : base(Target)
         DefaultBuildSettings = BuildSettingsVersion.V5;
         Type = TargetType.Editor;
 		ExtraModuleNames.AddRange(new string[] { "Blocks" });
-<<<<<<< HEAD
         DefaultBuildSettings = BuildSettingsVersion.V4;
-=======
->>>>>>> f5f6cc1d17237900be5e04cfe99ceb9293f1b14b
         //bUseUnityBuild = false;
         //bUsePCHFiles = false;
     }