From d08e172768fd09c6c21b0a1979f1849c78de9724 Mon Sep 17 00:00:00 2001
From: jiegeaiai <jiegeaiai@163.com>
Date: Mon, 17 Feb 2025 08:32:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FlightSimulation/FlightSimulation.sln.DotSettings.user | 7 -------
 FlightSimulation/FlightSimulation.uproject             | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 FlightSimulation/FlightSimulation.sln.DotSettings.user

diff --git a/FlightSimulation/FlightSimulation.sln.DotSettings.user b/FlightSimulation/FlightSimulation.sln.DotSettings.user
deleted file mode 100644
index a676c38..0000000
--- a/FlightSimulation/FlightSimulation.sln.DotSettings.user
+++ /dev/null
@@ -1,7 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-<<<<<<< HEAD
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=8792CA55_002D0D53_002D3B52_002D988D_002DD5718AB9BFE4_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FUE_003FUE_005F5_002E4_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003APrivate_002Ff_003ASkeletalMesh_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
-=======
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=66798BA2_002D00C7_002D35AE_002D969E_002D2DDAD846D8C9_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E4_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ACore_002Fd_003APublic_002Fd_003AExperimental_002Ff_003AConcurrentLinearAllocator_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
->>>>>>> 1ecf914d66e5eebe63eff5019c38145da7ebc68b
-	<s:String x:Key="/Default/Monitoring/StartMode/@EntryValue">Disabled</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/FlightSimulation/FlightSimulation.uproject b/FlightSimulation/FlightSimulation.uproject
index 2d16bc0..4d926f6 100644
--- a/FlightSimulation/FlightSimulation.uproject
+++ b/FlightSimulation/FlightSimulation.uproject
@@ -31,15 +31,15 @@
 			]
 		},
 		{
-<<<<<<< HEAD
 			"Name": "BlueprintFileUtils",
 			"Enabled": true
 		},
 		{
 			"Name": "JsonBlueprintUtilities",
-=======
+			"Enabled": true
+		},
+		{
 			"Name": "PixelStreaming",
->>>>>>> 1ecf914d66e5eebe63eff5019c38145da7ebc68b
 			"Enabled": true
 		}
 	]