test fix merge

This commit is contained in:
2020-10-02 13:53:18 +05:00
parent be49660384
commit 8516cfa6c3
7 changed files with 2932 additions and 3708 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 1014 B

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
@@ -130,7 +130,7 @@ CurrentRotGridSize=0
CurrentRotGridMode=GridMode_DivisionsOf360
[EditorStartup]
LastLevel=/Game/maps/ship
LastLevel=/Game/maps/black
[ModuleFileTracking]
ShipPresentation.TimeStamp=2020.10.01-12.38.04
@@ -993,7 +993,7 @@ ContentBrowserTab1.ActiveTypeFilters=World
ContentBrowserTab1.EnabledTypeFilters=
ContentBrowserTab1.ActiveFrontendFilters=
ContentBrowserTab1.EnabledFrontendFilters=
ContentBrowserTab1.SelectedPaths=/Game/materials/ship
ContentBrowserTab1.SelectedPaths=/Classes_Game/ShipPresentation/Public
ContentBrowserTab1.Favorites.SelectedPaths=
FavoritePaths=
ContentBrowserTab1.CollectionsExpanded=True
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff