PM/bmh
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改合并代码的问题

Browse Source
This commit is contained in:
jiegeaiai 2025-02-17 08:32:34 +08:00
parent 4ab0793f98
commit d08e172768
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FlightSimulation/FlightSimulation.sln.DotSettings.user
View File

@ -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>

6
FlightSimulation/FlightSimulation.uproject
View File

@ -31,15 +31,15 @@
]
},
{
<<<<<<< HEAD
"Name": "BlueprintFileUtils",
"Enabled": true
},
{
"Name": "JsonBlueprintUtilities",
=======
"Enabled": true
},
{
"Name": "PixelStreaming",
>>>>>>> 1ecf914d66e5eebe63eff5019c38145da7ebc68b
"Enabled": true
}
]